git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 139d606 94e0fb0)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Thu, 24 Sep 2009 22:13:11 +0000 (15:13 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Sep 2009 22:13:11 +0000 (15:13 -0700)
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


Trivial merge
Pandora Kernel Repository