]> 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, 7 Dec 2011 05:09:14 +0000 (16:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 05:09:14 +0000 (16:09 +1100)
commitff4c8ec731697aa0ebe90bf52428bbf5e7dd7949
tree9222d0755b14bb994c9f30d9485b7cc001893fb0
parent47040b2bb1945b5dfc4fa7aa514743d0d51d5afa
parent957855785735f755405136a9415c914ea36ee50c
Merge remote-tracking branch 'kmap_atomic/kmap_atomic'

Conflicts:
Documentation/feature-removal-schedule.txt
31 files changed:
Documentation/feature-removal-schedule.txt
arch/mips/mm/c-r4k.c
arch/mips/mm/init.c
arch/powerpc/mm/mem.c
arch/x86/mm/highmem_32.c
drivers/block/loop.c
drivers/gpu/drm/ttm/ttm_tt.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/ips.c
drivers/staging/hv/storvsc_drv.c
drivers/staging/zcache/zcache-main.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