Merge 3.10-rc5 into staging-next

2026-10-16 22:39:48 +00:00 · 2013-06-08 21:18:09 -07:00 · 2013-06-08 21:18:09 -07:00 · b37668d080
commit b37668d080
parent 451372066d 317ddd256b
480 changed files with 6893 additions and 3055 deletions
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
--- a/include/linux/list.h
+++ b/include/linux/list.h
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
--- a/include/linux/rculist_nulls.h
+++ b/include/linux/rculist_nulls.h
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
--- a/include/xen/xenbus.h
+++ b/include/xen/xenbus.h