diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-08 14:03:25 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-08 14:03:25 +1000 |
| commit | 1a5e7a7ebfbe7c5318da2d996efe790318c41e97 (patch) | |
| tree | 2bfd31c40539388ae66f42ddcbea42f46f5120f4 /Documentation/fb/sh7760fb.txt | |
| parent | 9b2af74a787f279e5478f4aef22c076c318b677b (diff) | |
| parent | 12513b76a021e5b41a9d5d5981da75dfd6480890 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/cx25821/cx25821-audups11.c
Diffstat (limited to 'Documentation/fb/sh7760fb.txt')
0 files changed, 0 insertions, 0 deletions