diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 14:45:58 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 14:45:58 +0200 |
| commit | 59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266 (patch) | |
| tree | b913718405d44a921905ac71044fbde410256865 /net/netlabel/netlabel_mgmt.h | |
| parent | Documentation: asus-laptop.txt references an obsolete Kconfig item (diff) | |
| parent | mm/memcg: move reclaim_stat into lruvec (diff) | |
| download | linux-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/netlabel_mgmt.h')
0 files changed, 0 insertions, 0 deletions