iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
489de30259
linux/arch/ppc/syslib
History
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
..
btext.c kbuild: introduce utsrelease.h 2006-07-03 23:30:54 +02:00
cpc700_pic.c [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
cpc700.h [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
cpm2_common.c [POWERPC] Change rheap functions to use ulongs instead of pointers 2007-05-09 23:01:43 -05:00
cpm2_pic.c [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
cpm2_pic.h [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
gen550_dbg.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
gen550_kgdb.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
gen550.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
gt64260_pic.c [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
harrier.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00
hawk_common.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00
i8259.c [PATCH] Scheduled removal of SA_xxx interrupt flags fixups 2007-02-14 08:09:54 -08:00
ibm44x_common.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm44x_common.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
ibm440gp_common.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm440gp_common.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm440gx_common.c [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
ibm440gx_common.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm440sp_common.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ibm440sp_common.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
ibm_ocp.c [POWERPC] Fix compile breakage for IBM/AMCC 4xx arch/ppc platforms 2007-06-02 21:01:56 +10:00
indirect_pci.c [POWERPC] Pass the pci_controller into pci_exclude_device 2007-06-29 01:57:22 -05:00
ipic.c fix file specification in comments 2007-05-09 08:58:16 +02:00
ipic.h [POWERPC] back up old school ipic.[hc] to arch/ppc 2006-08-30 10:34:33 +10:00
m8xx_setup.c [POWERPC] Remove the unused HTDMSOUND driver 2007-04-30 11:02:05 +10:00
m8xx_wdt.c [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
m8xx_wdt.h
m82xx_pci.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00
m82xx_pci.h
m8260_pci_erratum9.c [POWERPC] ppc: use syslog macro for the printk log level 2007-02-08 15:29:22 +11:00
m8260_setup.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Makefile [POWERPC] Pass the pci_controller into pci_exclude_device 2007-06-29 01:57:22 -05:00
mpc8xx_devices.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00
mpc8xx_sys.c [PATCH] ppc32: board-specific part of fs_enet update 2006-08-19 17:44:31 -04:00
mpc10x_common.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00
mpc52xx_devices.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
mpc52xx_pci.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mpc52xx_pci.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
mpc52xx_pic.c [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
mpc52xx_setup.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00
mpc52xx_sys.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
mpc83xx_devices.c [PATCH] USB: allow multiple types of EHCI controllers to be built as modules 2006-06-21 15:04:09 -07:00
mpc83xx_sys.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
mpc85xx_devices.c [PATCH] ppc32: board-specific part of fs_enet update 2006-08-19 17:44:31 -04:00
mpc85xx_sys.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
mv64x60_dbg.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mv64x60_win.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
mv64x60.c sysfs: kill unnecessary attribute->owner 2007-07-11 16:09:06 -07:00
mv64360_pic.c [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
ocp.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00
open_pic2.c [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
open_pic_defs.h [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
open_pic.c [POWERPC] PReP fixup after irq changes 2006-10-07 22:11:20 +10:00
pci_auto.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
ppc4xx_dma.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00
ppc4xx_pic.c [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
ppc4xx_setup.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ppc4xx_sgdma.c Merge branch 'linux-2.6' 2007-05-08 13:37:51 +10:00
ppc8xx_pic.c [POWERPC] ARCH=ppc pt_regs fixes 2006-10-10 11:55:25 +10:00
ppc8xx_pic.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ppc83xx_pci.h
ppc83xx_setup.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ppc83xx_setup.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ppc85xx_common.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ppc85xx_common.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ppc85xx_rio.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00
ppc85xx_rio.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ppc85xx_setup.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ppc85xx_setup.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ppc403_pic.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00
ppc405_pci.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00
ppc440spe_pcie.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ppc440spe_pcie.h
ppc_sys.c [PATCH] ppc32: odd fixes and improvements in ppc_sys 2006-04-28 21:05:16 +10:00
pq2_devices.c [PATCH] ppc32: board-specific part of fs_enet update 2006-08-19 17:44:31 -04:00
pq2_sys.c [PPC] MCC2 missing in MPC826x device_list 2007-05-17 21:10:17 +10:00
prep_nvram.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
qspan_pci.c potential parse error in ifdef part 3 2007-06-08 17:23:33 -07:00
todc_time.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
virtex_devices.c [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration 2007-07-11 13:24:40 +10:00
virtex_devices.h xilinxfb: xilinx framebuffer device driver 2007-05-08 11:15:34 -07:00
xilinx_pic.c [POWERPC] Spelling fixes: arch/ppc/ 2007-05-12 11:32:49 +10:00