summaryrefslogtreecommitdiffstats
path: root/net/netlabel
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-06-29 14:45:58 +0200
committerJiri Kosina <jkosina@suse.cz>2012-06-29 14:45:58 +0200
commit59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266 (patch)
treeb913718405d44a921905ac71044fbde410256865 /net/netlabel
parentDocumentation: asus-laptop.txt references an obsolete Kconfig item (diff)
parentmm/memcg: move reclaim_stat into lruvec (diff)
downloadlinux-59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266.tar.xz
linux-59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266.zip
Merge branch 'master' into for-next
Conflicts: include/linux/mmzone.h Synced with Linus' tree so that trivial patch can be applied on top of up-to-date code properly. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'net/netlabel')
0 files changed, 0 insertions, 0 deletions