merge mainline into arm
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 7 Apr 2013 16:08:00 +0000 (18:08 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 7 Apr 2013 16:08:00 +0000 (18:08 +0200)
commit73a04e69b7c37e028a86195da2e732590aa24616
tree4f0fc3c4f92308be4a1f8d6519a431a4d85dca07
parent389b31cd71bca8217a9c6e7f196f13d6ee76f4e3
parenta3216068139a8e1a9da993e3ef15367fe4869822
merge mainline into arm