kernel-fxtec-pro1x/arch/powerpc/sysdev
Linus Torvalds d7e9660ad9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits)
  netxen: update copyright
  netxen: fix tx timeout recovery
  netxen: fix file firmware leak
  netxen: improve pci memory access
  netxen: change firmware write size
  tg3: Fix return ring size breakage
  netxen: build fix for INET=n
  cdc-phonet: autoconfigure Phonet address
  Phonet: back-end for autoconfigured addresses
  Phonet: fix netlink address dump error handling
  ipv6: Add IFA_F_DADFAILED flag
  net: Add DEVTYPE support for Ethernet based devices
  mv643xx_eth.c: remove unused txq_set_wrr()
  ucc_geth: Fix hangs after switching from full to half duplex
  ucc_geth: Rearrange some code to avoid forward declarations
  phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
  drivers/net/phy: introduce missing kfree
  drivers/net/wan: introduce missing kfree
  net: force bridge module(s) to be GPL
  Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
  ...

Fixed up trivial conflicts:

 - arch/x86/include/asm/socket.h

   converted to <asm-generic/socket.h> in the x86 tree.  The generic
   header has the same new #define's, so that works out fine.

 - drivers/net/tun.c

   fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that
   switched over to using 'tun->socket.sk' instead of the redundantly
   available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
   to the TUN driver") which added a new 'tun->sk' use.

   Noted in 'next' by Stephen Rothwell.
2009-09-14 10:37:28 -07:00
..
bestcomm trivial: fix typos/grammar errors in Kconfig texts 2009-03-30 15:22:01 +02:00
qe_lib powerpc/qe: Implement qe_alive_during_sleep() helper function 2009-08-30 21:51:33 -07:00
6xx-suspend.S
axonram.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
cpm1.c cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
cpm2.c powerpc/cpm: Remove some cruft code and defines 2009-05-19 00:47:19 -05:00
cpm2_pic.c powerpc/cpm2: Fix set interrupt type 2009-02-06 10:44:02 -06:00
cpm2_pic.h
cpm_common.c powerpc/mm: Tweak PTE bit combination definitions 2009-03-24 13:47:33 +11:00
dart.h
dart_iommu.c
dcr-low.S powerpc/4xx: Extended DCR support v2 2008-12-21 14:21:15 +11:00
dcr.c powerpc: Const-qualify Device Node Argument to DCR Resource Extent API 2008-12-21 14:21:16 +11:00
fsl_gtm.c
fsl_lbc.c [MTD] [NAND] FSL-UPM: add multi chip support 2009-04-06 07:17:09 -07:00
fsl_msi.c powerpc/fsl: Support unique MSI addresses per PCIe Root Complex 2009-05-19 00:50:38 -05:00
fsl_msi.h
fsl_pci.c powerpc/pci: Clean up direct access to sysdata by FSL platforms 2009-05-21 15:44:22 +10:00
fsl_pci.h powerpc/fsl: Setup PCI inbound window based on actual amount of memory 2009-05-19 00:50:44 -05:00
fsl_rio.c powerpc: Remove unnecessary semicolons 2009-07-08 13:50:21 +10:00
fsl_soc.c powerpc/fsl: use of_iomap() for rstcr mapping 2009-05-19 00:46:18 -05:00
fsl_soc.h powerpc/fsl_soc: isolate legacy fsl_spi support to mpc832x_rdb boards 2009-04-01 08:59:23 -07:00
grackle.c
i8259.c
indirect_pci.c powerpc/pci: Clean up direct access to sysdata by indirect ops 2009-05-21 15:44:22 +10:00
ipic.c powerpc: Don't use alloc_bootmem() in init_IRQ() path 2009-07-08 13:50:25 +10:00
ipic.h
Kconfig
Makefile powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function 2009-06-17 00:30:22 -06:00
micropatch.c
mmio_nvram.c
mpc5xxx_clocks.c powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function 2009-06-17 00:30:22 -06:00
mpc8xx_pic.c
mpc8xx_pic.h
mpc8xxx_gpio.c
mpic.c powerpc: Don't use alloc_bootmem() in init_IRQ() path 2009-07-08 13:50:25 +10:00
mpic.h irq: change ->set_affinity() to return status, fix 2009-05-06 07:55:33 +02:00
mpic_msi.c
mpic_pasemi_msi.c
mpic_u3msi.c
msi_bitmap.c powerpc/msi: Mark the MSI bitmap selftest code as __init 2009-03-24 13:47:28 +11:00
mv64x60.h
mv64x60_dev.c
mv64x60_pci.c
mv64x60_pic.c
mv64x60_udbg.c
of_rtc.c
pmi.c powerpc/pmi: Irq handlers return irqreturn_t 2009-03-24 13:47:30 +11:00
ppc4xx_gpio.c
ppc4xx_pci.c powerpc: Remove unnecessary semicolons 2009-07-08 13:50:21 +10:00
ppc4xx_pci.h
ppc4xx_soc.c
rtc_cmos_setup.c
simple_gpio.c powerpc: Implement GPIO driver for simple memory-mapped banks 2008-12-30 11:13:45 -06:00
simple_gpio.h powerpc: Implement GPIO driver for simple memory-mapped banks 2008-12-30 11:13:45 -06:00
tsi108_dev.c
tsi108_pci.c powerpc/pci: Clean up direct access to sysdata on tsi108 platforms 2009-05-21 15:44:23 +10:00
uic.c powerpc: Don't use alloc_bootmem() in init_IRQ() path 2009-07-08 13:50:25 +10:00
xilinx_intc.c powerpc: Fix i8259 interrupt driver kernel crash on ML510 2009-09-05 14:58:07 -07:00
xilinx_pci.c powerpc/virtex: Add support for Xilinx PCI host bridge 2009-06-06 10:14:22 -06:00