git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6a389f b9c4dec)
Merge 3.1-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 29 Aug 2011 15:47:46 +0000 (08:47 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 29 Aug 2011 15:47:46 +0000 (08:47 -0700)
This resolves a conflict with:
drivers/staging/brcm80211/brcmsmac/types.h

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1  2 
drivers/staging/zcache/zcache-main.c patch | diff1 | diff2 | blob | history

diff --cc drivers/staging/zcache/zcache-main.c
Simple merge
Pandora Kernel Repository