git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: af0c25c fe0d422)

author	Greg Kroah-Hartman <gregkh@suse.de>
	Tue, 5 Jul 2011 14:35:09 +0000 (07:35 -0700)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Tue, 5 Jul 2011 14:35:09 +0000 (07:35 -0700)
commit	0c9e98af5e94877ad3b1af2c0f39b2376a462ded
tree	acbab68f802fadbff85590c139c87dc199bb465d	tree \| snapshot (tar.gz zip)
parent	af0c25c4876305dfa1a25ac1cc92d3cddfa476a6	commit \| diff
parent	fe0d42203cb5616eeff68b14576a0f7e2dd56625	commit \| diff

Merge Linux 3.0-rc6 into staging-next

This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Motorola kernel-slsi