tree de6ca90295730343c495be8d98be8efa322140ef
parent 139d6065c83071d5f66cd013a274a43699f8e2c1
parent 94e0fb086fc5663c38bbc0fe86d698be8314f82f
author David S. Miller <davem@davemloft.net> 1253830391 -0700
committer David S. Miller <davem@davemloft.net> 1253830391 -0700

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/cpc-usb/TODO
	drivers/staging/cpc-usb/cpc-usb_drv.c
	drivers/staging/cpc-usb/cpc.h
	drivers/staging/cpc-usb/cpc_int.h
	drivers/staging/cpc-usb/cpcusb.h