summaryrefslogtreecommitdiff
path: root/mm/mempool.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-26 19:16:46 (GMT)
committerDavid S. Miller <davem@davemloft.net>2011-04-26 19:16:46 (GMT)
commit2bd93d7af1581d40e3c4b25242472661cb7c637a (patch)
tree43c638422d20857339d8d908d6b65ebb8045edc0 /mm/mempool.c
parent64cad2ade1e6f890531a58318ca9ee013f92ef2f (diff)
parent0972ddb2373d5e127aabdcabd8305eff0242cd0b (diff)
downloadlinux-fsl-qoriq-2bd93d7af1581d40e3c4b25242472661cb7c637a.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Resolved logic conflicts causing a build failure due to drivers/net/r8169.c changes using a patch from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/mempool.c')
0 files changed, 0 insertions, 0 deletions