| commit | 949c3676cd6b2717c2abda5d9b10e6d6d7daf741 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@suse.de> | Wed Feb 02 13:35:58 2011 -0800 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Wed Feb 02 13:35:58 2011 -0800 |
| tree | f885084fc7061e072d4b0024256a5ab0cbb64c93 | |
| parent | 836aded1613dc93bebe7b1d2710f4a416725db50 [diff] | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 [diff] |
Staging: Merge branch 'staging-next' into 2.6.38-rc3 This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>