summaryrefslogtreecommitdiff
path: root/Documentation/sysctl
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 22:11:46 (GMT)
committerArnd Bergmann <arnd@arndb.de>2011-10-31 22:11:53 (GMT)
commit5839fec9d8db35b2b07359b18a77295418e239ad (patch)
treef060f613c7d76b2784a93c96b7b8cd3f0d201254 /Documentation/sysctl
parent43872fa788060eef91ae437957e0a5e39f1c56fd (diff)
parent0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff)
downloadlinux-fsl-qoriq-5839fec9d8db35b2b07359b18a77295418e239ad.tar.xz
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/sysctl')
0 files changed, 0 insertions, 0 deletions