kernel-fxtec-pro1x/arch
David S. Miller 90d3ac15e5 Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'
Conflicts:
	arch/sparc/kernel/smp_32.c

With merge conflict help from Daniel Hellstrom.

Signed-off-by: David S. Miller <davem@davemloft.net>
2011-05-20 13:10:22 -07:00
..
alpha Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' 2011-05-20 13:10:22 -07:00
arm Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' 2011-05-20 13:10:22 -07:00
avr32 avr32: add ATAG_BOARDINFO 2011-04-13 15:46:59 +02:00
blackfin Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' 2011-05-20 13:10:22 -07:00
cris sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
frv Fix common misspellings 2011-03-31 11:26:23 -03:00
h8300 genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
ia64 sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
m32r sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
m68k m68k,m68knommu: Wire up name_to_handle_at, open_by_handle_at, clock_adjtime, syncfs 2011-04-12 19:02:03 -07:00
microblaze usb: Fix Kconfig unmet dependencies for Microblaze EHCI 2011-04-13 15:43:59 -07:00
mips sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
mn10300 sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
parisc sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
powerpc Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' 2011-05-20 13:10:22 -07:00
s390 sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
score Fix common misspellings 2011-03-31 11:26:23 -03:00
sh sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
sparc Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' 2011-05-20 13:10:22 -07:00
tile sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
um Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' 2011-05-20 13:10:22 -07:00
unicore32 Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6 2011-04-07 11:14:49 -07:00
x86 Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' 2011-05-20 13:10:22 -07:00
xtensa Fix common misspellings 2011-03-31 11:26:23 -03:00
.gitignore
Kconfig