diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-02 21:35:58 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-02 21:35:58 (GMT) |
| commit | 949c3676cd6b2717c2abda5d9b10e6d6d7daf741 (patch) | |
| tree | f885084fc7061e072d4b0024256a5ab0cbb64c93 /fs/nilfs2/segment.h | |
| parent | 836aded1613dc93bebe7b1d2710f4a416725db50 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
| download | linux-fsl-qoriq-949c3676cd6b2717c2abda5d9b10e6d6d7daf741.tar.xz | |
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>
Diffstat (limited to 'fs/nilfs2/segment.h')
0 files changed, 0 insertions, 0 deletions