diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 16:41:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-30 16:41:59 +1000 |
| commit | eb0ba67a69ebe1e0b1d324254c66d8d1994d9e87 (patch) | |
| tree | 463ade2bb1c688626df25c91642348031bfb0106 /arch/arm/mach-shmobile/board-lager.c | |
| parent | 35bac10b42471964487e5afc5ce9e4d91ea9f8e9 (diff) | |
| parent | e661c8978e4833d4148d08b405a2f3175d6f97d9 (diff) | |
Merge remote-tracking branch 'leds/for-next'
Conflicts:
drivers/hid/hid-gt683r.c
Diffstat (limited to 'arch/arm/mach-shmobile/board-lager.c')
0 files changed, 0 insertions, 0 deletions