diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-14 12:54:46 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-14 12:54:46 +1000 |
| commit | efcabdf904e21dec870717b0ea4c06f2a1d05279 (patch) | |
| tree | 521072626538b70ef3be4de1bafa37a595097254 /drivers/mfd/menelaus.c | |
| parent | a8805aa3699d1b74b428d6c193761d3d4143a0c8 (diff) | |
| parent | 6b5e0736634d7b3d5f88d801e5a5e456190c42db (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/Makefile
drivers/staging/batman-adv/hard-interface.c
drivers/staging/mrst-touchscreen/Makefile
drivers/staging/mrst-touchscreen/intel-mid-touch.c
Diffstat (limited to 'drivers/mfd/menelaus.c')
0 files changed, 0 insertions, 0 deletions