Merged upstream: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ff91fad2db543325d7221c26ff42d7df3c574064
Merged upstream: http:// git.kernel. org/?p= linux/kernel/ git/torvalds/ linux-2. 6.git;a= commitdiff; h=ff91fad2db543 325d7221c26ff42 d7df3c574064