kernel_optimize_test/arch/powerpc
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
boot [POWERPC] Make sure initrd and dtb sections get into zImage correctly 2006-11-09 16:00:06 +11:00
configs [POWERPC] cell: update defconfig 2006-10-25 12:10:41 +10:00
kernel [POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class" 2006-11-22 12:13:36 +11:00
lib [POWERPC] Disallow kprobes on emulate_step and branch_taken 2006-11-01 15:14:12 +11:00
math-emu [POWERPC] ppc math-emu needs -fno-builtin-fabs for math.c and fabs.c 2006-09-26 15:24:35 +10:00
mm [PATCH] hugetlb: prepare_hugepage_range check offset too 2006-11-14 09:09:27 -08:00
oprofile [POWERPC] Fix oprofile support for e500 in arch/powerpc 2006-11-01 14:52:48 +11:00
platforms Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
sysdev [POWERPC] qe_lib: qe_issue_cmd writes wrong value to CECDR 2006-11-01 14:52:48 +11:00
xmon [POWERPC] Fix xmon IRQ handler for pt_regs removal 2006-10-10 11:47:07 +10:00
Kconfig Fix misc Kconfig typos 2006-11-30 05:22:59 +01:00
Kconfig.debug [POWERPC] print backtrace when entering xmon 2006-09-13 18:39:53 +10:00
Makefile [POWERPC] Create a "wrapper" script and use it in arch/powerpc/boot 2006-09-28 14:30:02 +10:00