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)
1  2 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

Simple merge
Simple merge