diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 14:45:53 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 14:45:53 +0100 |
| commit | c0206e228e34d8b414fcc63db45b831843adea06 (patch) | |
| tree | 937c005d696e4e141ac52233a73630f6fdab4ef6 /arch/s390/include/asm/msgbuf.h | |
| parent | Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | ARM: ux500: fix compilation after local timer rework (diff) | |
| download | linux-c0206e228e34d8b414fcc63db45b831843adea06.tar.xz linux-c0206e228e34d8b414fcc63db45b831843adea06.zip | |
Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into next/timer
* 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms:
ARM: ux500: fix compilation after local timer rework
Diffstat (limited to 'arch/s390/include/asm/msgbuf.h')
0 files changed, 0 insertions, 0 deletions