aha/arch
Linus Torvalds 5047887caf Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (34 commits)
  powerpc: Wireup new syscalls
  Move update_mmu_cache() declaration from tlbflush.h to pgtable.h
  powerpc/pseries: Remove kmalloc call in handling writes to lparcfg
  powerpc/pseries: Update arch vector to indicate support for CMO
  ibmvfc: Add support for collaborative memory overcommit
  ibmvscsi: driver enablement for CMO
  ibmveth: enable driver for CMO
  ibmveth: Automatically enable larger rx buffer pools for larger mtu
  powerpc/pseries: Verify CMO memory entitlement updates with virtual I/O
  powerpc/pseries: vio bus support for CMO
  powerpc/pseries: iommu enablement for CMO
  powerpc/pseries: Add CMO paging statistics
  powerpc/pseries: Add collaborative memory manager
  powerpc/pseries: Utilities to set firmware page state
  powerpc/pseries: Enable CMO feature during platform setup
  powerpc/pseries: Split retrieval of processor entitlement data into a helper routine
  powerpc/pseries: Add memory entitlement capabilities to /proc/ppc64/lparcfg
  powerpc/pseries: Split processor entitlement retrieval and gathering to helper routines
  powerpc/pseries: Remove extraneous error reporting for hcall failures in lparcfg
  powerpc: Fix compile error with binutils 2.15
  ...

Fixed up conflict in arch/powerpc/platforms/52xx/Kconfig manually.
2008-07-25 11:08:17 -07:00
..
alpha inflate: refactor inflate malloc code 2008-07-25 10:53:28 -07:00
arm gpiolib: allow user-selection 2008-07-25 10:53:30 -07:00
avr32 gpiolib: allow user-selection 2008-07-25 10:53:30 -07:00
blackfin Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2008-07-24 12:55:01 -07:00
cris inflate: refactor inflate malloc code 2008-07-25 10:53:28 -07:00
frv remove include/linux/pm_legacy.h 2008-07-24 10:47:22 -07:00
h8300 pty: remove unused UNIX98_PTY_COUNT options 2008-07-25 10:53:42 -07:00
ia64 kprobes: improve kretprobe scalability with hashed locking 2008-07-25 10:53:30 -07:00
m32r inflate: refactor inflate malloc code 2008-07-25 10:53:28 -07:00
m68k PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures 2008-07-24 10:47:21 -07:00
m68knommu Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2008-07-24 12:17:19 -07:00
mips remove unused #include <linux/dirent.h>'s 2008-07-25 10:53:34 -07:00
mn10300 inflate: refactor inflate malloc code 2008-07-25 10:53:28 -07:00
parisc flag parameters: pipe 2008-07-24 10:47:28 -07:00
powerpc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2008-07-25 11:08:17 -07:00
s390 S390 topology: don't use kthread() for arch_reinit_sched_domains() 2008-07-25 10:53:40 -07:00
sh inflate: refactor inflate malloc code 2008-07-25 10:53:28 -07:00
sparc pty: remove unused UNIX98_PTY_COUNT options 2008-07-25 10:53:42 -07:00
sparc64 kprobes: improve kretprobe scalability with hashed locking 2008-07-25 10:53:30 -07:00
um Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2008-07-24 12:55:01 -07:00
x86 calgary iommu: use the first kernels TCE tables in kdump 2008-07-25 10:53:41 -07:00
xtensa flag parameters: pipe 2008-07-24 10:47:28 -07:00
.gitignore
Kconfig introduce HAVE_EFFICIENT_UNALIGNED_ACCESS Kconfig symbol 2008-07-25 10:53:27 -07:00