diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 20:29:08 -0400 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 20:29:08 -0400 | 
| commit | 73154383f02998fdd6a1f26c7ef33bfc3785a101 (patch) | |
| tree | 85a4c10cf32172b99aed01e95ded7269afcc9d7d /scripts/unifdef.c | |
| parent | 362ed48dee509abe24cf84b7e137c7a29a8f4d2d (diff) | |
| parent | ca0dde97178e75ed1370b8616326f5496a803d65 (diff) | |
Merge branch 'akpm' (incoming from Andrew)
Merge first batch of fixes from Andrew Morton:
 - A couple of kthread changes
 - A few minor audit patches
 - A number of fbdev patches.  Florian remains AWOL so I'm picking up
   some of these.
 - A few kbuild things
 - ocfs2 updates
 - Almost all of the MM queue
(And in the meantime, I already have the second big batch from Andrew
pending in my mailbox ;^)
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (149 commits)
  memcg: take reference before releasing rcu_read_lock
  mem hotunplug: fix kfree() of bootmem memory
  mmKconfig: add an option to disable bounce
  mm, nobootmem: do memset() after memblock_reserve()
  mm, nobootmem: clean-up of free_low_memory_core_early()
  fs/buffer.c: remove unnecessary init operation after allocating buffer_head.
  numa, cpu hotplug: change links of CPU and node when changing node number by onlining CPU
  mm: fix memory_hotplug.c printk format warning
  mm: swap: mark swap pages writeback before queueing for direct IO
  swap: redirty page if page write fails on swap file
  mm, memcg: give exiting processes access to memory reserves
  thp: fix huge zero page logic for page with pfn == 0
  memcg: avoid accessing memcg after releasing reference
  fs: fix fsync() error reporting
  memblock: fix missing comment of memblock_insert_region()
  mm: Remove unused parameter of pages_correctly_reserved()
  firmware, memmap: fix firmware_map_entry leak
  mm/vmstat: add note on safety of drain_zonestat
  mm: thp: add split tail pages to shrink page list in page reclaim
  mm: allow for outstanding swap writeback accounting
  ...
Diffstat (limited to 'scripts/unifdef.c')
0 files changed, 0 insertions, 0 deletions
