diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 13:25:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 13:25:19 -0700 |
commit | 7c5a47346989e43ba34a9c94a55cc0aef7ed6b3b (patch) | |
tree | 1270a325328c306ae1f462d77008ec885231594b /include/linux/eventpoll.h | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace (diff) | |
parent | Merge tag 'disintegrate-openrisc-20121009' of git://git.infradead.org/users/dhowells/linux-headers (diff) | |
download | linux-dev-7c5a47346989e43ba34a9c94a55cc0aef7ed6b3b.tar.xz linux-dev-7c5a47346989e43ba34a9c94a55cc0aef7ed6b3b.zip |
Merge tag 'openrisc-uapi' of git://openrisc.net/jonas/linux
Pull OpenRISC uapi disintegration from Jonas Bonn:
"OpenRISC UAPI disintegration work from David Howells"
* tag 'openrisc-uapi' of git://openrisc.net/jonas/linux:
UAPI: (Scripted) Disintegrate arch/openrisc/include/asm
Diffstat (limited to 'include/linux/eventpoll.h')
0 files changed, 0 insertions, 0 deletions