Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 06:02:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
78df969550
linux/arch
History
Linus Torvalds 5f56886521 Merge branch 'akpm' (incoming from Andrew) 
Merge third batch of fixes from Andrew Morton:
 "Most of the rest.  I still have two large patchsets against AIO and
  IPC, but they're a bit stuck behind other trees and I'm about to
  vanish for six days.

   - random fixlets
   - inotify
   - more of the MM queue
   - show_stack() cleanups
   - DMI update
   - kthread/workqueue things
   - compat cleanups
   - epoll udpates
   - binfmt updates
   - nilfs2
   - hfs
   - hfsplus
   - ptrace
   - kmod
   - coredump
   - kexec
   - rbtree
   - pids
   - pidns
   - pps
   - semaphore tweaks
   - some w1 patches
   - relay updates
   - core Kconfig changes
   - sysrq tweaks"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (109 commits)
  Documentation/sysrq: fix inconstistent help message of sysrq key
  ethernet/emac/sysrq: fix inconstistent help message of sysrq key
  sparc/sysrq: fix inconstistent help message of sysrq key
  powerpc/xmon/sysrq: fix inconstistent help message of sysrq key
  ARM/etm/sysrq: fix inconstistent help message of sysrq key
  power/sysrq: fix inconstistent help message of sysrq key
  kgdb/sysrq: fix inconstistent help message of sysrq key
  lib/decompress.c: fix initconst
  notifier-error-inject: fix module names in Kconfig
  kernel/sys.c: make prctl(PR_SET_MM) generally available
  UAPI: remove empty Kbuild files
  menuconfig: print more info for symbol without prompts
  init/Kconfig: re-order CONFIG_EXPERT options to fix menuconfig display
  kconfig menu: move Virtualization drivers near other virtualization options
  Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
  relay: use macro PAGE_ALIGN instead of FIX_SIZE
  kernel/relay.c: move FIX_SIZE macro into relay.c
  kernel/relay.c: remove unused function argument actor
  drivers/w1/slaves/w1_ds2760.c: fix the error handling in w1_ds2760_add_slave()
  drivers/w1/slaves/w1_ds2781.c: fix the error handling in w1_ds2781_add_slave()
  ...
2013-04-30 17:37:43 -07:00
..
alpha dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
arc arc, print-fatal-signals: reduce duplicated information 2013-04-30 17:04:02 -07:00
arm Merge branch 'akpm' (incoming from Andrew) 2013-04-30 17:37:43 -07:00
arm64 dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
avr32 Merge branch 'akpm' (incoming from Andrew) 2013-04-30 17:37:43 -07:00
blackfin Merge branch 'akpm' (incoming from Andrew) 2013-04-30 17:37:43 -07:00
c6x dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
cris Merge branch 'akpm' (incoming from Andrew) 2013-04-30 17:37:43 -07:00
frv dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
h8300 dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
hexagon dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
ia64 Merge branch 'akpm' (incoming from Andrew) 2013-04-30 17:37:43 -07:00
m32r dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
m68k dump_stack: consolidate dump_stack() implementations and unify their behaviors 2013-04-30 17:04:02 -07:00
metag dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
microblaze dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
mips Merge branch 'akpm' (incoming from Andrew) 2013-04-30 17:37:43 -07:00
mn10300 dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
openrisc dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
parisc Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS 2013-04-30 17:04:09 -07:00
powerpc Merge branch 'akpm' (incoming from Andrew) 2013-04-30 17:37:43 -07:00
s390 Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS 2013-04-30 17:04:09 -07:00
score dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
sh Merge branch 'akpm' (incoming from Andrew) 2013-04-30 17:37:43 -07:00
sparc Merge branch 'akpm' (incoming from Andrew) 2013-04-30 17:37:43 -07:00
tile Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS 2013-04-30 17:04:09 -07:00
um dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
unicore32 Merge branch 'akpm' (incoming from Andrew) 2013-04-30 17:37:43 -07:00
x86 Merge branch 'akpm' (incoming from Andrew) 2013-04-30 17:37:43 -07:00
xtensa dump_stack: unify debug information printed by show_regs() 2013-04-30 17:04:02 -07:00
.gitignore
Kconfig idle: Remove GENERIC_IDLE_LOOP config switch 2013-04-17 10:39:38 +02:00