| commit | 6eafa4604cfa109a89524d35d93df11c37bd66b0 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@suse.de> | Mon Aug 29 08:47:46 2011 -0700 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Mon Aug 29 08:47:46 2011 -0700 |
| tree | de0eddca052ed01318df559d7cd80211dd57a0fd | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 [diff] | |
| parent | b9c4decbd9530b0c4c6dc4ad0626af628b79cd53 [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>