Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Thu, 21 Oct 2010 21:52:49 +0000 (14:52 -0700)
committerColin Cross <ccross@android.com>
Thu, 21 Oct 2010 21:52:49 +0000 (14:52 -0700)
commite97de0161a96a573f129525f9f5fabf93d34170c
tree8c15d77bde76cadc8c46ab140c98d1d66b9dab0c
parent13b7fba9ceae2289d828208d6fbb19d7caddefdd
parente837dc17608f46e6ffb72393fa84601eda6c3e4f
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
drivers/hid/hid-core.c
drivers/hid/hid-ids.h