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
..
2006-01-09 14:49:54 +11:00
2005-09-28 15:42:53 +10:00
2006-12-04 20:39:30 +11:00
2007-02-16 14:00:19 +11:00
2007-07-11 16:02:11 -07:00
2007-03-09 15:03:25 +11:00
2007-03-22 22:52:55 +11:00
2007-05-07 20:31:14 +10:00
2007-05-08 11:15:20 -07:00
2007-06-28 19:16:38 +10:00
2006-02-15 15:32:22 -08:00
2006-12-11 16:35:07 +11:00
2007-05-08 13:43:48 +10:00
2007-05-07 20:31:14 +10:00
2007-05-08 11:15:05 -07:00
2006-07-03 15:27:00 -07:00
2006-06-30 18:20:44 +02:00
2007-04-24 21:31:51 +10:00
2007-02-16 14:00:19 +11:00
2007-05-11 08:29:34 -07:00
2007-01-11 18:18:22 -08:00
2007-06-28 19:19:20 +10:00
2007-06-14 22:29:57 +10:00
2005-10-31 13:37:12 +11:00
2005-11-03 16:24:25 +11:00
2006-12-04 20:40:52 +11:00
2007-07-03 15:24:46 +10:00
2005-11-03 16:02:23 +11:00
2007-05-02 20:04:30 +10:00
2006-10-25 11:54:18 +10:00
2007-03-05 07:57:51 -08:00
2007-05-08 11:54:20 +10:00
2005-11-03 16:59:17 +11:00