diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:21:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:21:15 -0400 |
| commit | b6897130f0ac8ac33043be736770eb5f58164044 (patch) | |
| tree | c922f449e0ba26e225795684f2ef46954406c7c0 /arch/frv/include/asm/resource.h | |
| parent | b4fe19f78e84813e720d0f0482da22194a7728e3 (diff) | |
| parent | fd3bc66f1dd5d062b5f0a7afc90c69d8da5b42db (diff) | |
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/frv/include/asm/resource.h')
0 files changed, 0 insertions, 0 deletions