summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add linux-next specific files for 20151215next-20151215Stephen Rothwell2015-12-155-0/+10119
* fix up for bad merge of arch/powerpc/include/asm/pgtable-ppc64.h: add pmd_[di...Stephen Rothwell2015-12-151-0/+1
* Merge branch 'akpm/master'Stephen Rothwell2015-12-15118-3302/+2230
|\
| * net: drop tcp_memcontrol.cVladimir Davydov2015-12-157-219/+92
| * mm: memcontrol: only manage socket pressure for CONFIG_INETArnd Bergmann2015-12-152-2/+4
| * mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEMJohannes Weiner2015-12-154-12/+20
| * mm: memcontrol: allow to disable kmem accounting for cgroup2Vladimir Davydov2015-12-152-2/+8
| * mm: memcontrol: account "kmem" consumers in cgroup2 memory controllerJohannes Weiner2015-12-151-7/+11
| * mm-memcontrol-move-kmem-accounting-code-to-config_memcg-fixJohannes Weiner2015-12-151-1/+1
| * mm-memcontrol-move-kmem-accounting-code-to-config_memcg-v2Johannes Weiner2015-12-158-175/+200
| * mm: memcontrol: move kmem accounting code to CONFIG_MEMCGJohannes Weiner2015-12-1511-216/+206
| * mm: memcontrol: separate kmem code from legacy tcp accounting codeJohannes Weiner2015-12-151-21/+12
| * mm: memcontrol: group kmem init and exit functions togetherJohannes Weiner2015-12-151-81/+76
| * mm: memcontrol: give the kmem states more descriptive namesJohannes Weiner2015-12-154-35/+38
| * mm: memcontrol: remove double kmem page_counter initJohannes Weiner2015-12-151-14/+10
| * mm: memcontrol: drop unused @css argument in memcg_init_kmemJohannes Weiner2015-12-153-5/+6
| * memstick: use sector_div instead of do_divArnd Bergmann2015-12-151-1/+1
| * dma-mapping: use offset_in_page macroGeliang Tang2015-12-151-2/+2
| * dma-mapping: remove <asm-generic/dma-coherent.h>Christoph Hellwig2015-12-154-42/+29
| * HAVE_DMA_ATTRS: remove leftovers in KconfigValentin Rothberg2015-12-152-2/+1
| * dma-mapping: always provide the dma_map_ops based implementationChristoph Hellwig2015-12-1568-631/+368
| * tile: uninline dma_set_maskChristoph Hellwig2015-12-152-28/+30
| * sparc: use generic dma_set_maskChristoph Hellwig2015-12-151-15/+0
| * metag: convert to dma_map_opsChristoph Hellwig2015-12-153-209/+117
| * m68k: convert to dma_map_opsChristoph Hellwig2015-12-153-142/+32
| * mn10300: convert to dma_map_opsChristoph Hellwig2015-12-153-163/+67
| * parisc: convert to dma_map_opsChristoph Hellwig2015-12-156-270/+124
| * frv: convert to dma_map_opsChristoph Hellwig2015-12-154-179/+101
| * nios2: dma mapping fixesChristoph Hellwig2015-12-151-9/+11
| * nios2: convert to dma_map_opsChristoph Hellwig2015-12-153-186/+85
| * cris: convert to dma_map_opsChristoph Hellwig2015-12-153-165/+51
| * c6x: dma mapping fixesChristoph Hellwig2015-12-153-6/+12
| * C6X: fix build breakageDan Carpenter2015-12-151-1/+1
| * c6x: convert to dma_map_opsChristoph Hellwig2015-12-153-142/+47
| * blackfin: convert to dma_map_opsChristoph Hellwig2015-12-153-137/+43
| * avr32: convert to dma_map_opsChristoph Hellwig2015-12-153-373/+85
| * arc: dma mapping fixesChristoph Hellwig2015-12-151-4/+4
| * arc: convert to dma_map_opsChristoph Hellwig2015-12-153-230/+109
| * dma-mapping: make the generic coherent dma mmap implementation optionalChristoph Hellwig2015-12-152-2/+5
| * iio: Documentation: add IIO configfs documentationDaniel Baluta2015-12-152-0/+114
| * iio: trigger: introduce IIO hrtimer based triggerDaniel Baluta2015-12-153-0/+205
| * iio: core: fix ptr_ret.cocci warningsFengguang Wu2015-12-151-3/+1
| * iio: core: introduce IIO software triggersDaniel Baluta2015-12-154-0/+263
| * iio: core: introduce IIO configfs supportDaniel Baluta2015-12-153-0/+59
| * fs/adfs/adfs.h: tidy up commentsAndrew Morton2015-12-151-14/+14
| * fs/overlayfs/super.c needs pagemap.hAndrew Morton2015-12-151-0/+1
| * include/linux/property.h: fix build issues with gcc-4.4.4Andrew Morton2015-12-151-4/+12
|/
* Merge branch 'akpm-current/current'Stephen Rothwell2015-12-15375-4927/+8434
|\
| * ipc/msg.c: use freezable blocking callYogesh Gaur2015-12-111-1/+2
| * ipc/msg.c: msgsnd: use freezable blocking callManinder Singh2015-12-111-1/+1