diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:57:32 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:57:32 +1100 |
| commit | a3a718ab2627709fff94459ac57515688552215d (patch) | |
| tree | 1cca04c0c5c441d070ac64cb9b8dfb7214f70b2f /fs/mpage.c | |
| parent | 68f77685093b481221feb265b846930b1c9f34c7 (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 'fs/mpage.c')
0 files changed, 0 insertions, 0 deletions