Linus Torvalds 5115f3c19d Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dmaengine updates from Vinod Koul: "This is fairly big pull by my standards as I had missed last merge window. So we have the support for device tree for slave-dmaengine, large updates to dw_dmac driver from Andy for reusing on different architectures. Along with this we have fixes on bunch of the drivers" Fix up trivial conflicts, usually due to #include line movement next to each other. * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits) Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT" ARM: dts: pl330: Add #dma-cells for generic dma binding support DMA: PL330: Register the DMA controller with the generic DMA helpers DMA: PL330: Add xlate function DMA: PL330: Add new pl330 filter for DT case. dma: tegra20-apb-dma: remove unnecessary assignment edma: do not waste memory for dma_mask dma: coh901318: set residue only if dma is in progress dma: coh901318: avoid unbalanced locking dmaengine.h: remove redundant else keyword dma: of-dma: protect list write operation by spin_lock dmaengine: ste_dma40: do not remove descriptors for cyclic transfers dma: of-dma.c: fix memory leakage dw_dmac: apply default dma_mask if needed dmaengine: ioat - fix spare sparse complain dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING dw_dmac: add support for Lynxpoint DMA controllers dw_dmac: return proper residue value dw_dmac: fill individual length of descriptor ...		2013-02-26 09:24:48 -08:00
..
netfilter	Driver core patches for 3.9-rc1	2013-02-21 12:05:51 -08:00
af_inet.c	v4 GRE: Add TCP segmentation offload for GRE	2013-02-15 15:17:11 -05:00
ah4.c	net: Add skb_unclone() helper function.	2013-02-15 15:10:37 -05:00
arp.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
cipso_ipv4.c
datagram.c	ipv4: Add a socket release callback for datagram sockets	2013-01-21 14:17:05 -05:00
devinet.c	ipv4: introduce address lifetime	2013-01-29 13:59:57 -05:00
esp4.c	xfrm4: Invalidate all ipv4 routes on IPsec pmtu events	2013-01-21 12:43:54 +01:00
fib_frontend.c	ipv4: fib: fix a comment.	2013-01-11 15:58:08 -08:00
fib_lookup.h
fib_rules.c
fib_semantics.c
fib_trie.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
gre.c	v4 GRE: Add TCP segmentation offload for GRE	2013-02-15 15:17:11 -05:00
icmp.c
igmp.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
inet_connection_sock.c	soreuseport: fix use of uid in tb->fastuid	2013-01-27 01:01:42 -05:00
inet_diag.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-12-12 18:07:07 -08:00
inet_fragment.c	net: frag, move LRU list maintenance outside of rwlock	2013-01-29 13:36:24 -05:00
inet_hashtables.c	soreuseport: TCP/IPv4 implementation	2013-01-23 13:44:01 -05:00
inet_lro.c
inet_timewait_sock.c
inetpeer.c
ip_forward.c
ip_fragment.c	net: Add skb_unclone() helper function.	2013-02-15 15:10:37 -05:00
ip_gre.c	ip_gre: remove an extra dst_release()	2013-02-19 22:24:04 -05:00
ip_input.c	ipv4: Disallow non-namespace aware protocols to register.	2013-02-05 14:42:23 -05:00
ip_options.c
ip_output.c	net: Fix possible wrong checksum generation.	2013-02-13 13:30:10 -05:00
ip_sockglue.c	net: prevent setting ttl=0 via IP_TTL	2013-01-08 17:57:10 -08:00
ip_vti.c
ipcomp.c	ipcomp: Mark as netns_ok.	2013-02-04 15:46:15 -05:00
ipconfig.c	net: proc: change proc_net_fops_create to proc_create	2013-02-18 14:53:08 -05:00
ipip.c	net: fix possible wrong checksum generation	2013-01-28 00:27:15 -05:00
ipmr.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
Kconfig	net/ipv4: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:40:00 -08:00
Makefile
netfilter.c
ping.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
proc.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
protocol.c	ipv4: Disallow non-namespace aware protocols to register.	2013-02-05 14:42:23 -05:00
raw.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
route.c	net: ipv4: fix waring -Wunused-variable	2013-02-19 13:18:13 -05:00
syncookies.c	tcp: make sysctl_tcp_ecn namespace aware	2013-01-06 21:09:56 -08:00
sysctl_net_ipv4.c	tcp: remove Appropriate Byte Count support	2013-02-05 14:51:16 -05:00
tcp.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-02-26 09:24:48 -08:00
tcp_bic.c
tcp_cong.c	tcp: remove Appropriate Byte Count support	2013-02-05 14:51:16 -05:00
tcp_cubic.c
tcp_diag.c
tcp_fastopen.c
tcp_highspeed.c
tcp_htcp.c
tcp_hybla.c
tcp_illinois.c
tcp_input.c	net: Fix possible wrong checksum generation.	2013-02-13 13:30:10 -05:00
tcp_ipv4.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
tcp_lp.c
tcp_memcontrol.c
tcp_metrics.c
tcp_minisocks.c	tcp: send packets with a socket timestamp	2013-02-13 13:22:16 -05:00
tcp_output.c	net: Add skb_unclone() helper function.	2013-02-15 15:10:37 -05:00
tcp_probe.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
tcp_scalable.c
tcp_timer.c
tcp_vegas.c
tcp_vegas.h
tcp_veno.c
tcp_westwood.c
tcp_yeah.c
tunnel4.c
udp.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
udp_diag.c
udp_impl.h
udplite.c
xfrm4_input.c	net: Add skb_unclone() helper function.	2013-02-15 15:10:37 -05:00
xfrm4_mode_beet.c
xfrm4_mode_transport.c
xfrm4_mode_tunnel.c	ip: fix warning in xfrm4_mode_tunnel_input	2013-02-18 12:42:48 -05:00
xfrm4_output.c
xfrm4_policy.c	xfrm: make gc_thresh configurable in all namespaces	2013-02-06 11:36:29 +01:00
xfrm4_state.c
xfrm4_tunnel.c