projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81ec44a cc883af)
Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Feb 2013 01:55:48 +0000 (17:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Feb 2013 01:55:48 +0000 (17:55 -0800)
Pull misc ia64 bits from Tony Luck.

* tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  MAINTAINERS: update SGI & ia64 Altix stuff
  sysctl: Enable IA64 "ignore-unaligned-usertrap" to be used cross-arch

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/ia64/Kconfig patch | diff1 | diff2 | blob | history
init/Kconfig patch | diff1 | diff2 | blob | history
kernel/sysctl.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/ia64/Kconfig
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/sysctl.c
Simple merge
John Crispins staging tree