diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-03 12:12:10 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-03 12:12:10 +1100 |
| commit | 7c11fc2df13692b1d1214c916dab58619cbf655c (patch) | |
| tree | 1faa9454ebc1c375790faa2bedf4ef2252add6a0 /mm/truncate.c | |
| parent | ea18a2001267a73910e26974f12d53cf56cb7edf (diff) | |
| parent | a3ba01b63468c925518da2da0ac3be11358f60cb (diff) | |
Merge remote branch 'bkl-config/config'
Conflicts:
arch/powerpc/kernel/setup_64.c
include/linux/hardirq.h
include/linux/smp_lock.h
Diffstat (limited to 'mm/truncate.c')
0 files changed, 0 insertions, 0 deletions