Eric W. Biederman
a4fe34bf90
tcp_memcontrol: Remove the per netns control. ...
The code that is implemented is per memory cgroup not per netns, and
having per netns bits is just confusing. Remove the per netns bits to
make it easier to see what is really going on.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-21 18:43:02 -04:00
Merge branch 'acpi-hotplug'
2013-08-30 14:14:25 +02:00
include/asm-generic/vtime.h: avoid zero-length file
2013-09-30 14:31:02 -07:00
ARM: SoC cleanups for 3.12
2013-09-06 13:21:16 -07:00
Revert "drm: mark context support as a legacy subsystem"
2013-09-20 08:32:59 +10:00
Device tree core updates for v3.12
2013-09-10 13:53:52 -07:00
ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256
2013-08-30 16:12:39 +03:00
net: fix build warnings because of net_get_random_once merge
2013-10-21 16:27:03 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
tcp_memcontrol: Remove the per netns control.
2013-10-21 18:43:02 -04:00
Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next
2013-09-03 09:01:08 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-09-12 16:11:45 -07:00
sound fixes for 3.12-rc1
2013-09-12 08:52:41 -07:00
target/iscsi: Bump versions to v4.1.0
2013-09-10 20:23:37 -07:00
Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block
2013-09-22 15:00:11 -07:00
bonding: add Netlink support active_slave option
2013-10-19 18:58:46 -04:00
fbdev changes for 3.12:
2013-09-05 09:49:32 -07:00
xen-netback: enable IPv6 TCP GSO to the guest
2013-10-17 15:35:17 -04:00
a4fe34bf90