Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/compat-wireless
	config/rootfiles/core/40/filelists/files
	doc/packages-list.txt
This commit is contained in:
Arne Fitzenreiter
2010-08-11 18:08:51 +02:00
12 changed files with 2008 additions and 2099 deletions

View File

@@ -3210,7 +3210,7 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_EZUSB=y
# CONFIG_USB_SERIAL_GENERIC is not set
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m