Merge tag 'v3.6-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 5 Sep 2012 05:57:19 +0000 (22:57 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 5 Sep 2012 05:57:19 +0000 (22:57 -0700)
Linux 3.6-rc4

# gpg: Signature made Sat 01 Sep 2012 10:40:33 AM PDT using RSA key ID 00411886
# gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>"

1  2 
drivers/input/keyboard/tegra-kbc.c

Simple merge