]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8ad95c6 adeac85)
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)
commitaecc5002ed9e2fe621fe326609705110478baef9
treede0eddca052ed01318df559d7cd80211dd57a0fdtree | snapshot
parent8ad95c648ce15cc2a0e2109c6e08773949bae72fcommit | diff
parentadeac8550e20879975de4001ce977cdb06449df4commit | 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
Linux Kernel Source Tree.