tree 96b1bf44be94e7e85bb2bf5b2b87a4dbd452ecde
parent 8d71ff0bef9cf4e70108a9a2762f2361e607abde
parent 3bbfe0596746e1590888a6e1e6a07583265238b7
author Linus Torvalds <torvalds@linux-foundation.org> 1223917444 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1223917444 -0700

Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc

* 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
  proc: remove kernel.maps_protect
  proc: remove now unneeded ADDBUF macro
  [PATCH] proc: show personality via /proc/pid/personality
  [PATCH] signal, procfs: some lock_task_sighand() users do not need rcu_read_lock()
  proc: move PROC_PAGE_MONITOR to fs/proc/Kconfig
  proc: make grab_header() static
  proc: remove unused get_dma_list()
  proc: remove dummy vmcore_open()
  proc: proc_sys_root tweak
  proc: fix return value of proc_reg_open() in "too late" case

Fixed up trivial conflict in removed file arch/sparc/include/asm/dma_32.h