kevin/linux
1
Fork 0
Code
5e2f55c6aa
linux/arch/powerpc/sysdev
History
Linus Torvalds 79346507ad Merge git://git.infradead.org/mtd-2.6 
* git://git.infradead.org/mtd-2.6: (82 commits)
  mtd: fix build error in m25p80.c
  mtd: Remove redundant mutex from mtd_blkdevs.c
  MTD: Fix wrong check register_blkdev return value
  Revert "mtd: cleanup Kconfig dependencies"
  mtd: cfi_cmdset_0002: make sector erase command variable
  mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips
  mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode
  mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one
  block2mtd: dubious assignment
  P4080/mtd: Fix the freescale lbc issue with 36bit mode
  P4080/eLBC: Make Freescale elbc interrupt common to elbc devices
  mtd: phram: use KBUILD_MODNAME
  mtd: OneNAND: S5PC110: Fix double call suspend & resume function
  mtd: nand: fix MTD_MODE_RAW writes
  jffs2: use kmemdup
  mtd: sm_ftl: cosmetic, use bool when possible
  mtd: r852: remove useless pci powerup/down from suspend/resume routines
  mtd: blktrans: fix a race vs kthread_stop
  mtd: blktrans: kill BKL
  mtd: allow to unload the mtdtrans module if its block devices aren't open
  ...

Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c
2010-10-30 08:31:35 -07:00
..
bestcomm of/address: Clean up function declarations 2010-08-01 01:42:42 -06:00
qe_lib arch/powerpc/sysdev/qe_lib/qe.c: Add of_node_put to avoid memory leak 2010-08-31 16:41:03 -05:00
6xx-suspend.S
axonram.c powerpc: remove references to of_device and to_of_device 2010-07-24 09:58:21 -06:00
cpm1.c of/gpio: add default of_xlate function if device has a node pointer 2010-07-05 16:14:30 -06:00
cpm2_pic.c powerpc: Remove whitespace in irq chip name fields 2010-02-17 14:02:48 +11:00
cpm2_pic.h powerpc/cpm2: Checkpatch cleanup 2010-03-04 10:43:58 -06:00
cpm2.c powerpc/fsl-cpm: Configure clock correctly for SCC 2010-04-19 23:13:03 -05:00
cpm_common.c of/gpio: add default of_xlate function if device has a node pointer 2010-07-05 16:14:30 -06:00
dart_iommu.c powerpc/dart_iommu: Support for 64-bit iommu bypass window on PCIe 2010-09-02 14:07:32 +10:00
dart.h
dcr-low.S
dcr.c
fsl_85xx_cache_ctlr.h powerpc/85xx: add cache-sram support 2010-10-14 00:54:38 -05:00
fsl_85xx_cache_sram.c powerpc/85xx: add cache-sram support 2010-10-14 00:54:38 -05:00
fsl_85xx_l2ctlr.c powerpc/85xx: add cache-sram support 2010-10-14 00:54:38 -05:00
fsl_gtm.c of/address: Clean up function declarations 2010-08-01 01:42:42 -06:00
fsl_lbc.c P4080/mtd: Fix the freescale lbc issue with 36bit mode 2010-10-25 15:41:04 +01:00
fsl_msi.c Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2010-10-21 21:19:54 -07:00
fsl_msi.h powerpc/fsl_msi: add removal path and probe failing path 2010-05-24 21:26:35 -05:00
fsl_pci.c powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips 2010-10-14 00:53:03 -05:00
fsl_pci.h powerpc/fsl-pci: Fix MSI support on 83xx platforms 2010-10-14 00:52:30 -05:00
fsl_pmc.c powerpc: remove references to of_device and to_of_device 2010-07-24 09:58:21 -06:00
fsl_rio.c rapidio: add handling of redundant routes 2010-10-27 18:03:16 -07:00
fsl_soc.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -07:00
fsl_soc.h powerpc/5121: shared DIU framebuffer support 2010-08-01 17:06:44 -06:00
grackle.c of: add 'of_' prefix to machine_is_compatible() 2010-02-09 08:33:00 -07:00
i8259.c powerpc: Convert i8259_lock to raw_spinlock 2010-02-19 14:52:31 +11:00
indirect_pci.c
ipic.c powerpc: Convert ipic_lock to raw_spinlock 2010-02-19 14:52:31 +11:00
ipic.h
Kconfig
Makefile powerpc/85xx: add cache-sram support 2010-10-14 00:54:38 -05:00
micropatch.c powerpc/cpm1: Mark micropatch code/data static and __init 2010-07-11 11:04:06 -05:00
mmio_nvram.c powerpc/nvram: Allow byte length reads from mmio NVRAM driver 2009-08-20 10:29:22 +10:00
mpc5xxx_clocks.c powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function 2009-06-17 00:30:22 -06:00
mpc8xx_pic.c powerpc: Remove whitespace in irq chip name fields 2010-02-17 14:02:48 +11:00
mpc8xx_pic.h
mpc8xxx_gpio.c powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers 2010-10-14 00:53:00 -05:00
mpic_msi.c powerpc: Fix MSI support on U4 bridge PCIe slot 2009-12-18 14:55:43 +11:00
mpic_pasemi_msi.c pci: Convert msi to new irq_chip functions 2010-10-12 16:53:34 +02:00
mpic_u3msi.c pci: Convert msi to new irq_chip functions 2010-10-12 16:53:34 +02:00
mpic.c powerpc/mpic: Add ability to reset a core via MPIC 2010-07-09 11:28:27 +10:00
mpic.h powerpc/mpic: Add ability to reset a core via MPIC 2010-07-09 11:28:27 +10:00
msi_bitmap.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
mv64x60_dev.c of: Merge of_platform_bus_type with platform_bus_type 2010-07-24 09:57:51 -06:00
mv64x60_pci.c powerpc/pci: Remove owner field from attribute initialization in PCI bridge init 2010-08-05 13:53:35 -07:00
mv64x60_pic.c powerpc: Remove get_irq_desc() 2009-10-30 17:20:55 +11:00
mv64x60_udbg.c
mv64x60.h
of_rtc.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pmi.c powerpc: Remove pr_<level> uses of KERN_<level> 2010-10-13 16:19:03 +11:00
ppc4xx_gpio.c of/gpio: add default of_xlate function if device has a node pointer 2010-07-05 16:14:30 -06:00
ppc4xx_pci.c powerpc/44x: Adding PCI-E support for PowerPC 460SX based SOC. 2010-05-07 15:07:19 -04:00
ppc4xx_pci.h powerpc/44x: Adding PCI-E support for PowerPC 460SX based SOC. 2010-05-07 15:07:19 -04:00
ppc4xx_soc.c powerpc/4xx: Add optional "reset_type" property to control reboot via dts 2010-05-05 12:51:54 -04:00
rtc_cmos_setup.c
simple_gpio.c of/gpio: add default of_xlate function if device has a node pointer 2010-07-05 16:14:30 -06:00
simple_gpio.h
tsi108_dev.c
tsi108_pci.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
uic.c powerpc: Remove whitespace in irq chip name fields 2010-02-17 14:02:48 +11:00
xilinx_intc.c powerpc: Make "intspec" pointers in irq_host->xlate() const 2009-12-09 17:10:37 +11:00
xilinx_pci.c powerpc/virtex: Add support for Xilinx PCI host bridge 2009-06-06 10:14:22 -06:00