diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 16:35:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 16:35:09 +0200 |
| commit | 0c9e98af5e94877ad3b1af2c0f39b2376a462ded (patch) | |
| tree | acbab68f802fadbff85590c139c87dc199bb465d /sound/pcmcia | |
| parent | staging: remove obsoleted CS5535/CS5536 GPIO driver (diff) | |
| parent | Linux 3.0-rc6 (diff) | |
| download | linux-0c9e98af5e94877ad3b1af2c0f39b2376a462ded.tar.xz linux-0c9e98af5e94877ad3b1af2c0f39b2376a462ded.zip | |
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>
Diffstat (limited to 'sound/pcmcia')
0 files changed, 0 insertions, 0 deletions