Merge branch 'master' into for-next

Conflicts: drivers/devfreq/exynos4_bus.c Sync with Linus' tree to be able to apply patches that are against newer code (mvneta).
2026-11-13 07:31:07 +00:00 · 2013-01-29 10:48:30 +01:00 · 2013-01-29 10:48:30 +01:00 · 617677295b
commit 617677295b
parent 5c8d1b68e0 6abb7c2577
11814 changed files with 584660 additions and 356538 deletions
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
--- a/include/net/bluetooth/a2mp.h
+++ b/include/net/bluetooth/a2mp.h
--- a/include/net/bluetooth/amp.h
+++ b/include/net/bluetooth/amp.h
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
--- a/include/net/cls_cgroup.h
+++ b/include/net/cls_cgroup.h
--- a/include/net/gro_cells.h
+++ b/include/net/gro_cells.h
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
--- a/include/net/ip.h
+++ b/include/net/ip.h
--- a/include/net/ip6_checksum.h
+++ b/include/net/ip6_checksum.h
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
--- a/include/net/netfilter/nf_conntrack_core.h
+++ b/include/net/netfilter/nf_conntrack_core.h
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
--- a/include/net/netfilter/nf_queue.h
+++ b/include/net/netfilter/nf_queue.h
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
--- a/include/net/netns/sctp.h
+++ b/include/net/netns/sctp.h
--- a/include/net/netns/x_tables.h
+++ b/include/net/netns/x_tables.h
--- a/include/net/netprio_cgroup.h
+++ b/include/net/netprio_cgroup.h
--- a/include/net/nfc/hci.h
+++ b/include/net/nfc/hci.h
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
--- a/include/net/route.h
+++ b/include/net/route.h
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
--- a/include/net/sctp/command.h
+++ b/include/net/sctp/command.h
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
--- a/include/net/sctp/ulpqueue.h
+++ b/include/net/sctp/ulpqueue.h
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h