diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-20 18:35:58 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-20 18:35:58 +0400 |
| commit | 1b1c7409b75a8b62906b78b84c8469002072b738 (patch) | |
| tree | 91ceea4d8fae61b29e9a716c5e6ad56c3b5f588b /arch/c6x | |
| parent | 573f8c8d13377ec03c2d23269f8eea50c11a7432 (diff) | |
| parent | b28748fb5d21d5d64c9ce31579ffbbd41f317042 (diff) | |
| download | linux-1b1c7409b75a8b62906b78b84c8469002072b738.tar.xz | |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/include/asm/memory.h
Diffstat (limited to 'arch/c6x')
0 files changed, 0 insertions, 0 deletions