linux/arch
Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-28 09:44:56 -07:00
..
alpha alpha: remove dma64_addr_t usage 2010-10-27 18:03:17 -07:00
arm Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
avr32 ptrace: cleanup arch_ptrace() on avr32 2010-10-27 18:03:10 -07:00
blackfin ptrace: cleanup arch_ptrace() and friends on Blackfin 2010-10-27 18:03:10 -07:00
cris ptrace: cleanup arch_ptrace() on cris 2010-10-27 18:03:10 -07:00
frv ptrace: cleanup arch_ptrace() on frv 2010-10-27 18:03:10 -07:00
h8300 ptrace: cleanup arch_ptrace() on h8300 2010-10-27 18:03:11 -07:00
ia64 taskstats: use real microsecond granularity for CPU times 2010-10-27 18:03:17 -07:00
m32r ptrace: cleanup arch_ptrace() on m32r 2010-10-27 18:03:11 -07:00
m68k ptrace: cleanup arch_ptrace() on m68k 2010-10-27 18:03:11 -07:00
m68knommu ptrace: cleanup arch_ptrace() on m68knommu 2010-10-27 18:03:11 -07:00
microblaze ptrace: cleanup arch_ptrace() on microblaze 2010-10-27 18:03:11 -07:00
mips mips: remove dma64_addr_t usage 2010-10-27 18:03:17 -07:00
mn10300 Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 2010-10-27 18:53:26 -07:00
parisc ptrace: cleanup arch_ptrace() on parisc 2010-10-27 18:03:11 -07:00
powerpc Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-10-27 19:04:36 -07:00
s390 taskstats: use real microsecond granularity for CPU times 2010-10-27 18:03:17 -07:00
score ptrace: cleanup arch_ptrace() on score 2010-10-27 18:03:12 -07:00
sh ptrace: cleanup arch_ptrace() on sh 2010-10-27 18:03:12 -07:00
sparc sparc: remove dma64_addr_t usage 2010-10-27 18:03:17 -07:00
tile Remove duplicate includes from many files 2010-10-27 18:03:18 -07:00
um ptrace: cleanup arch_ptrace() on um 2010-10-27 18:03:12 -07:00
x86 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-10-27 18:48:00 -07:00
xtensa ptrace: cleanup arch_ptrace() on xtensa 2010-10-27 18:03:12 -07:00
.gitignore
Kconfig Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core 2010-09-24 09:12:05 +02:00