]> Git Repo - linux.git/commitdiff
Merge branch 'acrux' into for-linus
authorJiri Kosina <[email protected]>
Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +0200)
committerJiri Kosina <[email protected]>
Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +0200)
Conflicts:
drivers/hid/hid-ids.h

1  2 
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

Simple merge
Simple merge
Simple merge
Simple merge
This page took 0.0816 seconds and 4 git commands to generate.