Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
authorMichal Simek <monstr@monstr.eu>
Fri, 30 Mar 2012 10:10:03 +0000 (12:10 +0200)
committerMichal Simek <monstr@monstr.eu>
Fri, 30 Mar 2012 10:10:03 +0000 (12:10 +0200)

Trivial merge