From: David S. Miller <davem@davemloft.net>
Date: Thu, 24 Sep 2009 22:13:11 +0000 (-0700)
Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
X-Git-Tag: v2.6.32-rc1~27^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b3f6af86378d0a10ca2f1ded1da124aef13b62c;p=pandora-kernel.git

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
---

8b3f6af86378d0a10ca2f1ded1da124aef13b62c
Reading git-diff-tree failed