]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kmap_atomic/kmap_atomic'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 05:21:30 +0000 (16:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 05:21:30 +0000 (16:21 +1100)
commit8754d9fe092f763c33238808c240d5c2f9fdf16a
tree50a221629cfb4589dd92c3ff9d9ee210fe6879c3
parentb2556bad3b5f72c3b5b4e42641ae8eca911e03f6
parent7b8fa32e4a6e4b030530220e875644eec6524c74
Merge remote-tracking branch 'kmap_atomic/kmap_atomic'

Conflicts:
Documentation/feature-removal-schedule.txt
37 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/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
fs/btrfs/extent_io.c
fs/btrfs/inode.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
lib/swiotlb.c
mm/filemap.c
mm/swapfile.c
mm/vmalloc.c