Linus Torvalds 489de30259 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc ... * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits) [POWERPC] Create add_rtc() function to enable the RTC CMOS driver [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration [POWERPC] Oprofile support for Power 5++ [POWERPC] Enable arbitary speed tty ioctls and split input/output speed [POWERPC] Make drivers/char/hvc_console.c:khvcd() static [POWERPC] Remove dead code for preventing pread() and pwrite() calls [POWERPC] Remove unnecessary #undef printk from prom.c [POWERPC] Fix typo in Ebony default DTS [POWERPC] Check for NULL ppc_md.init_IRQ() before calling [POWERPC] Remove extra return statement [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED [POWERPC] pasemi: Rename platform [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports [POWERPC] Add __read_mostly support for powerpc [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane [POWERPC] Create a dummy zImage if no valid platform has been selected [POWERPC] PS3: Bootwrapper support. [POWERPC] powermac i2c: Use mutex [POWERPC] Schedule removal of arch/ppc ... Fixed up conflicts manually in: Documentation/feature-removal-schedule.txt arch/powerpc/kernel/pci_32.c arch/powerpc/kernel/pci_64.c include/asm-powerpc/pci.h and asked the powerpc people to double-check the result..		2007-07-16 17:58:08 -07:00
..
4xx_io	[POWERPC] Spelling fixes: arch/ppc/	2007-05-12 11:32:49 +10:00
8xx_io	[NET]: Kill eth_copy_and_sum().	2007-07-10 22:08:12 -07:00
8260_io	[NET]: Kill eth_copy_and_sum().	2007-07-10 22:08:12 -07:00
amiga	Remove all inclusions of <linux/config.h>	2006-10-04 03:38:54 -04:00
boot	[POWERPC] Spelling fixes: arch/ppc/	2007-05-12 11:32:49 +10:00
configs	[PPC] MPC8272 ADS compile fixed, defconfig refreshed.	2007-04-12 12:36:45 -05:00
kernel	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2007-07-16 17:58:08 -07:00
lib	[POWERPC] User rheap from arch/powerpc/lib	2007-05-09 23:28:17 -05:00
mm	[PPC] Add linux/pagemap.h to arch/ppc/mm/tlb.c	2007-07-10 00:33:07 -05:00
platforms	[POWERPC] Abolish unused ucBoardRev variables	2007-06-28 19:19:29 +10:00
syslib	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2007-07-16 17:58:08 -07:00
xmon	[POWERPC] PPC: Use ARRAY_SIZE macro when appropriate	2007-02-08 16:08:25 +11:00
.gitignore	[POWERPC] Add files build to .gitignore	2006-12-04 20:41:29 +11:00
Kconfig	PCI: Only build PCI syscalls on architectures that want them	2007-07-11 16:02:13 -07:00
Kconfig.debug	ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc	2006-03-28 10:22:10 +11:00
Makefile	Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc	2006-03-28 17:03:19 +11:00