]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kmap_atomic/kmap_atomic'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 07:11:58 +0000 (18:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 07:11:58 +0000 (18:11 +1100)
commitaf2febd23cf63d3c1693764a41d0a24f9e62cb78
tree15e0b3baa397efd15686724ea500b95bffabb8c0
parentc7825e7bc850efa151a45c390816833f4939b048
parent7b8fa32e4a6e4b030530220e875644eec6524c74
Merge remote-tracking branch 'kmap_atomic/kmap_atomic'

Conflicts:
Documentation/feature-removal-schedule.txt
41 files changed:
Documentation/feature-removal-schedule.txt
arch/mips/mm/c-r4k.c
arch/mips/mm/init.c
arch/powerpc/mm/hugetlbpage.c
arch/powerpc/mm/mem.c
drivers/ata/libata-sff.c
drivers/block/loop.c
drivers/edac/edac_mc.c
drivers/gpu/drm/ttm/ttm_tt.c
drivers/md/bitmap.c
drivers/net/ethernet/intel/e1000/e1000_main.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/sun/cassini.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/hyperv/rndis_filter.c
drivers/scsi/cxgbi/libcxgbi.c
drivers/scsi/fcoe/fcoe.c
drivers/scsi/ips.c
drivers/staging/hv/storvsc_drv.c
drivers/staging/zcache/zcache-main.c
drivers/staging/zram/zram_drv.c
drivers/target/target_core_transport.c
drivers/target/tcm_fc/tfc_io.c
fs/btrfs/extent_io.c
fs/btrfs/inode.c
fs/btrfs/scrub.c
fs/fuse/dev.c
fs/fuse/file.c
fs/gfs2/aops.c
fs/gfs2/quota.c
fs/jbd/journal.c
fs/jbd2/journal.c
fs/logfs/dir.c
fs/logfs/readwrite.c
fs/logfs/segment.c
fs/nfs/nfs4proc.c
kernel/debug/kdb/kdb_support.c
lib/swiotlb.c
mm/filemap.c
mm/swapfile.c
mm/vmalloc.c