Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/hid.h
This commit is contained in:
Dmitry Torokhov
2006-12-08 01:07:56 -05:00
4033 changed files with 157164 additions and 79872 deletions
+7
View File
@@ -227,4 +227,11 @@ config ANSLCD
tristate "Support for ANS LCD display"
depends on ADB_CUDA && PPC_PMAC
config PMAC_RACKMETER
tristate "Support for Apple XServe front panel LEDs"
depends on PPC_PMAC
help
This driver procides some support to control the front panel
blue LEDs "vu-meter" of the XServer macs.
endmenu