projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6eafa4604cfa109a89524d35d93df11c37bd66b0
treede0eddca052ed01318df559d7cd80211dd57a0fdtree | snapshot (tar.gz zip)
parentc6a389f123b9f68d605bb7e0f9b32ec1e3e14132commit | diff
parentb9c4decbd9530b0c4c6dc4ad0626af628b79cd53commit | diff
Merge 3.1-rc4 into staging-next

This resolves a conflict with:
drivers/staging/brcm80211/brcmsmac/types.h

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