diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-05 00:29:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-05 00:29:53 +0100 |
| commit | 9ef9dc69d4167276c04590d67ee55de8380bc1ad (patch) | |
| tree | f0afd03cd9184eda2fe14c41f09daec79a62682e /net/ipv4/xfrm4_mode_beet.c | |
| parent | Merge branch 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ch... (diff) | |
| parent | Merge branches 'at91', 'ixp', 'master', 'misc', 'pxa' and 'realview' into devel (diff) | |
| download | linux-9ef9dc69d4167276c04590d67ee55de8380bc1ad.tar.xz linux-9ef9dc69d4167276c04590d67ee55de8380bc1ad.zip | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (44 commits)
[ARM] 4822/1: RealView: Change the REALVIEW_MPCORE configuration option
[ARM] 4821/1: RealView: Remove the platform dependencies from localtimer.c
[ARM] 4820/1: RealView: Select the timer IRQ at run-time
[ARM] 4819/1: RealView: Fix entry-macro.S to work with multiple platforms
[ARM] 4818/1: RealView: Add core-tile detection
[ARM] 4817/1: RealView: Move the AMBA resource definitions to realview_eb.c
[ARM] 4816/1: RealView: Move the platform-specific definitions into board-eb.h
[ARM] 4815/1: RealView: Add clockevents suport for the local timers
[ARM] 4814/1: RealView: Add broadcasting clockevents support for ARM11MPCore
[ARM] 4813/1: Add SMP helper functions for clockevents support
[ARM] 4812/1: RealView: clockevents support for the RealView platforms
[ARM] 4811/1: RealView: clocksource support for the RealView platforms
[ARM] 4736/1: Export atags to userspace and allow kexec to use customised atags
[ARM] 4798/1: pcm027: fix missing header file
[ARM] 4803/1: pxa: fix building issue of poodle.c caused by patch 4737/1
[ARM] 4801/1: pxa: fix building issues of missing pxa2xx-regs.h
[ARM] pxa: introduce sysdev for pxa3xx static memory controller
[ARM] pxa: add preliminary suspend/resume code for pxa3xx
[ARM] pxa: introduce sysdev for GPIO register saving/restoring
[ARM] pxa: introduce sysdev for IRQ register saving/restoring
...
Diffstat (limited to 'net/ipv4/xfrm4_mode_beet.c')
0 files changed, 0 insertions, 0 deletions