diff options
| author | Simon Horman <horms@verge.net.au> | 2012-11-08 12:49:35 +0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2012-11-08 12:49:35 +0400 |
| commit | ab3ff12a78a64b851ab22726ab99dca6ad37bf94 (patch) | |
| tree | 4340e41495528f1a1dc733b45a792617ff4e8992 /samples | |
| parent | 631a7b5d958d2ef2c2333b105794c693642f0641 (diff) | |
| parent | 2944628607f76e4755660cd710f22a4748ef88d8 (diff) | |
| download | linux-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.tar.xz | |
Merge branch 'soc' into boards
Conflicts:
arch/arm/configs/marzen_defconfig
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions