Merge commit 'd01d0756f75e7a5b4b43764ad45b83c4340f11d6' into next-samsung
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 6 Aug 2010 12:27:24 +0000 (21:27 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 6 Aug 2010 12:27:24 +0000 (21:27 +0900)
commit929343ef840051b102b67ad1bc8748dbe7c7ce13
tree61e307d665458687aeb60cf4f9a194e47ef38039
parentd8653d9f657d052dca18407c59349981ac579469
parentd01d0756f75e7a5b4b43764ad45b83c4340f11d6
Merge commit 'd01d0756f75e7a5b4b43764ad45b83c4340f11d6' into next-samsung
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/input/keyboard/Kconfig