diff options
| author | Linus Torvalds | 2010-09-07 14:34:37 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-09-07 14:34:37 -0700 |
| commit | a44a553f827f28d46130c9818dbcb95f4262b96c (patch) | |
| tree | 44bd46b1604eb93f15196193a99725f94138af41 /include/linux/icmp.h | |
| parent | ce7db282a3830f57f5b05ec48288c23a5c4d66d5 (diff) | |
| parent | 93f68f1ef787d97ab688f78a01f446e85bb9a496 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/pseries: Correct rtas_data_buf locking in dlpar code
powerpc/85xx: Add P1021 PCI IDs and quirks
arch/powerpc/sysdev/qe_lib/qe.c: Add of_node_put to avoid memory leak
arch/powerpc/platforms/83xx/mpc837x_mds.c: Add missing iounmap
fsl_rio: fix compile errors
powerpc/85xx: Fix compile issue with p1022_ds due to lmb rename to memblock
powerpc/85xx: Fix compilation of mpc85xx_mds.c
powerpc: Don't use kernel stack with translation off
powerpc/perf_event: Reduce latency of calling perf_event_do_pending
powerpc/kexec: Adds correct calling convention for kexec purgatory
Diffstat (limited to 'include/linux/icmp.h')
0 files changed, 0 insertions, 0 deletions