| commit | f3e96492f6da63eba56f04f3c5cc2af524b5a925 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 20 17:40:45 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 20 17:40:45 2011 -0700 |
| tree | 94dcd9521bbd937cb9d5fc7b30a48ec20d2a6980 | |
| parent | 8653b3f1d5bf2c7b09962a5747c74280758444ee [diff] | |
| parent | e9569c1511d2590a27b46b94bafb7acece034e5c [diff] |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6881/1: cputype.h uses __attribute_const__ which requires including kernel.h ARM: Add new syscalls