| commit | 5a16c48fe9498e7f0162ae6e131c136a2d433d39 | |
| author | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Tue, 23 Aug 2011 03:26:08 +0000 (23 13:26 +1000) | ||
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Tue, 23 Aug 2011 03:26:08 +0000 (23 13:26 +1000) | ||
| tree | c06f8b2dcd1aed760f61086510fa6d4330ddbe92 | treesnapshot (tar.gz zip) |
| parent | 8188ee2adf7d9b93b82db1713952b121bde6ed44 | commitdiff |
| parent | a4b4433c511cf4361bb0afabba69e16632002d32 | commitdiff |
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Conflicts:
drivers/leds/Kconfig