diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 04:21:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 04:21:15 +0200 |
| commit | b6897130f0ac8ac33043be736770eb5f58164044 (patch) | |
| tree | c922f449e0ba26e225795684f2ef46954406c7c0 /arch/ia64/include/uapi/asm | |
| parent | Merge tag 'arm64-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/cmari... (diff) | |
| parent | Merge tag 'disintegrate-powerpc-20121009' into merge (diff) | |
| download | linux-b6897130f0ac8ac33043be736770eb5f58164044.tar.xz linux-b6897130f0ac8ac33043be736770eb5f58164044.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc uapi disintegration from Benjamin Herrenschmidt.
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
UAPI: (Scripted) Disintegrate arch/powerpc/include/asm
Diffstat (limited to 'arch/ia64/include/uapi/asm')
0 files changed, 0 insertions, 0 deletions