1
linux/arch/powerpc/platforms
Linus Torvalds 8a9ea3237e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
  dp83640: free packet queues on remove
  dp83640: use proper function to free transmit time stamping packets
  ipv6: Do not use routes from locally generated RAs
  |PATCH net-next] tg3: add tx_dropped counter
  be2net: don't create multiple RX/TX rings in multi channel mode
  be2net: don't create multiple TXQs in BE2
  be2net: refactor VF setup/teardown code into be_vf_setup/clear()
  be2net: add vlan/rx-mode/flow-control config to be_setup()
  net_sched: cls_flow: use skb_header_pointer()
  ipv4: avoid useless call of the function check_peer_pmtu
  TCP: remove TCP_DEBUG
  net: Fix driver name for mdio-gpio.c
  ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
  rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
  ipv4: fix ipsec forward performance regression
  jme: fix irq storm after suspend/resume
  route: fix ICMP redirect validation
  net: hold sock reference while processing tx timestamps
  tcp: md5: add more const attributes
  Add ethtool -g support to virtio_net
  ...

Fix up conflicts in:
 - drivers/net/Kconfig:
	The split-up generated a trivial conflict with removal of a
	stale reference to Documentation/networking/net-modules.txt.
	Remove it from the new location instead.
 - fs/sysfs/dir.c:
	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
	with Eric Biederman's changes for tagged directories.
2011-10-25 13:25:22 +02:00
..
8xx powerpc/irq: Stop exporting irq_map 2011-05-04 15:02:15 +10:00
40x net: fix IBM EMAC driver after rename. 2011-08-18 21:33:49 -07:00
44x net: fix IBM EMAC driver after rename. 2011-08-18 21:33:49 -07:00
52xx Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
82xx powerpc: rename ppc_pci_*_flags to pci_*_flags 2011-07-12 09:28:04 -05:00
83xx atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
85xx Kconfig: remove redundant CONFIG_ prefix on two symbols 2011-10-13 18:14:28 +02:00
86xx powerpc/86xx: improve calculation of DIU pixel clock on the MPC8610 HPCD 2011-06-27 08:36:17 -05:00
512x powerpc/mpc5121_ads_cpld: Remove use of NO_IRQ_IGNORE 2011-05-19 15:31:47 +10:00
amigaone pcspkr: Cleanup Kconfig dependencies 2011-06-09 15:01:41 +02:00
cell net: fix IBM EMAC driver after rename. 2011-08-18 21:33:49 -07:00
chrp Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
embedded6xx treewide: typo 'interrrupt' word corrections. 2011-09-15 14:13:02 +02:00
iseries atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
maple powerpc/maple: Register CPC925 EDAC device on all boards with CPC925 2011-06-29 17:48:26 +10:00
pasemi treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
powermac powerpc: Fix device-tree matching for Apple U4 bridge 2011-09-29 19:22:40 -07:00
prep pcspkr: Cleanup Kconfig dependencies 2011-06-09 15:01:41 +02:00
ps3 powerpc: Remove trival irq_host_ops.unmap 2011-05-19 15:31:39 +10:00
pseries powerpc/pseries: Simplify vpa deregistration functions 2011-08-05 14:47:58 +10:00
wsp powerpc: Avoid extra indirect function call in sending IPIs 2011-06-20 11:21:32 +10:00
fsl_uli1575.c PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs 2010-02-23 09:43:31 -08:00
Kconfig powerpc: Make KVM_GUEST default to n 2011-08-05 14:47:57 +10:00
Kconfig.cputype powerpc/64: Make server perfmon only built on ppc64 server devices 2011-07-22 13:34:30 +10:00
Makefile powerpc: Add WSP platform 2011-05-06 13:32:35 +10:00