diff options
| author | Arnd Bergmann | 2012-09-28 21:41:56 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2012-09-28 21:41:56 +0200 |
| commit | 25e4b485fb8eeda8aa7a2e1e45fbb31538565117 (patch) | |
| tree | 12d57a8403b3dc7aca72a13896c3e73aca98a4a9 /Documentation/magic-number.txt | |
| parent | ARM: Remove mach-bcmring (diff) | |
| parent | ARM: bcmring: use proper MMIO accessors (diff) | |
| download | kernel-qcow2-linux-25e4b485fb8eeda8aa7a2e1e45fbb31538565117.tar.gz kernel-qcow2-linux-25e4b485fb8eeda8aa7a2e1e45fbb31538565117.tar.xz kernel-qcow2-linux-25e4b485fb8eeda8aa7a2e1e45fbb31538565117.zip | |
Merge branch 'bcmring/cleanup' into bcmring/removal
Doing a large-scale cleaning and removing the platform in another
branch don't mix well, so do the trivial merge here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/magic-number.txt')
0 files changed, 0 insertions, 0 deletions