History

Merge tag 'v3.10' into next

Merge 3.10 in order to get some of the last minute powerpc changes, resolve conflicts and add additional fixes on top of them.

Benjamin Herrenschmidt committed 13 years ago

Commit 24a72ac2 parents 6e0b8bc 8bb495e366 files · +7856 −2018Browse files

Showing the changes to include/uapi/linux (1 of 366 files). Show all

Unified · Split

include/uapi/linux/Kbuild+1−0
@@ -261,6 +261,7 @@ header-y += net_dropmon.h · 260 unmodified lines
261header-y += net_tstamp.h261header-y += net_tstamp.h
262header-y += netconf.h262header-y += netconf.h
263header-y += netdevice.h263header-y += netdevice.h
264header-y += netlink_diag.h
264header-y += netfilter.h265header-y += netfilter.h
265header-y += netfilter_arp.h266header-y += netfilter_arp.h
266header-y += netfilter_bridge.h267header-y += netfilter_bridge.h