git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 013a468 bf46b9a)
Merge git://git.infradead.org/users/dwmw2/spectra-2.6 into work
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Jun 2010 19:13:11 +0000 (12:13 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Jun 2010 19:13:11 +0000 (12:13 -0700)
1  2 
drivers/staging/Kconfig patch | diff1 | diff2 | blob | history
drivers/staging/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/staging/Kconfig
Simple merge
diff --cc drivers/staging/Makefile
Simple merge
Pandora Kernel Repository