aboutsummaryrefslogtreecommitdiffstats
path: root/sound/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-19 13:32:40 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-19 13:32:40 -0500
commitf238085415c56618e042252894f2fcc971add645 (patch)
treed69f821381995a7d377283f962583075dc149739 /sound/Makefile
parenta240d9f1d8e6421cb970632b93e71b2f66c2cd70 (diff)
parent4ef4caad41630c7caa6e2b94c6e7dda7e9689714 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: [PATCH] Generic HID layer - update MAINTAINERS input/hid: Supporting more keys from the HUT Consumer Page [PATCH] Generic HID layer - build: USB_HID should select HID
Diffstat (limited to 'sound/Makefile')
0 files changed, 0 insertions, 0 deletions