History log of /linux/arch/sparc/kernel/cpu.c (Results 451 – 475 of 488)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 4d117c5c 08-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'sched/urgent' into sched/core


# d34dd829 07-Dec-2008 Sam Ravnborg <sam@ravnborg.org>

sparc: unify kernel/cpu

o use cpu_32.c as base
o move all sparc64 definitions to the common cpu.c
o use ifdef for the parts that differs and use cpu_32 as base
o spitfire.h required a CONFIG_SPARC64

sparc: unify kernel/cpu

o use cpu_32.c as base
o move all sparc64 definitions to the common cpu.c
o use ifdef for the parts that differs and use cpu_32 as base
o spitfire.h required a CONFIG_SPARC64 guard to fix build on 32 bit

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

show more ...


# 14d676f5 05-Dec-2008 Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# c0515566 04-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc7' into x86/cleanups


# b8307db2 04-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc7' into tracing/core


# cb9c34e6 04-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc7' into core/locking


# ec98ce48 04-Dec-2008 James Morris <jmorris@namei.org>

Merge branch 'master' into next

Conflicts:
fs/nfsd/nfs4recover.c

Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().

Signed-off-by: James Morris <jmorris@namei.org>


# c36910c1 03-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent


# 52749188 03-Dec-2008 Paul Mackerras <paulus@samba.org>

Merge branch 'merge'


# dfdc5437 03-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace

Merge x86/dumpstack into tracing/ftrace because upcoming ftrace changes
depend on cleanups already in x86/dumpstack.

Also merg

Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace

Merge x86/dumpstack into tracing/ftrace because upcoming ftrace changes
depend on cleanups already in x86/dumpstack.

Also merge to latest upstream -rc.

show more ...


# aa2ba5f1 03-Dec-2008 David S. Miller <davem@davemloft.net>

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c


# a64d31ba 02-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into cpus4096

Conflicts:
kernel/trace/ring_buffer.c


Revision tags: v2.6.28-rc7
# 3af4182c 01-Dec-2008 Takashi Iwai <tiwai@suse.de>

Merge branch 'upstream' into topic/asoc


# 409832f5 22-Nov-2008 Al Viro <viro@ftp.linux.org.uk>

sparc32 cpuinit flase positives

All noise since we don't have CPU hotplug there. However, they
did expose something very odd-looking in there - poke_viking()
does a bunch of identical btfixup each

sparc32 cpuinit flase positives

All noise since we don't have CPU hotplug there. However, they
did expose something very odd-looking in there - poke_viking()
does a bunch of identical btfixup each time it's called (i.e.
for each CPU). That one is left alone for now; just the trivial
misannotation fixes.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

show more ...


Revision tags: v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3, v2.6.28-rc2, v2.6.28-rc1, v2.6.27, v2.6.27-rc9, v2.6.27-rc8, v2.6.27-rc7, v2.6.27-rc6, v2.6.27-rc5, v2.6.27-rc4, v2.6.27-rc3, v2.6.27-rc2, v2.6.27-rc1, v2.6.26, v2.6.26-rc9, v2.6.26-rc8, v2.6.26-rc7, v2.6.26-rc6, v2.6.26-rc5, v2.6.26-rc4, v2.6.26-rc3, v2.6.26-rc2, v2.6.26-rc1
# f838bad1 22-Apr-2008 David Woodhouse <dwmw2@infradead.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


Revision tags: v2.6.25, v2.6.25-rc9, v2.6.25-rc8, v2.6.25-rc7
# 577f99c1 18-Mar-2008 David S. Miller <davem@davemloft.net>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c


# 2f633928 18-Mar-2008 David S. Miller <davem@davemloft.net>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


Revision tags: v2.6.25-rc6
# bed04a44 13-Mar-2008 Paul Mackerras <paulus@samba.org>

Merge branch 'linux-2.6'


Revision tags: v2.6.25-rc5
# 9446389e 08-Mar-2008 Trond Myklebust <Trond.Myklebust@netapp.com>

Merge commit 'origin' into devel


Revision tags: v2.6.25-rc4
# 665c1ef8 05-Mar-2008 Linus Torvalds <torvalds@woody.linux-foundation.org>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix link errors with gcc-4.3
sparc64: replace remain

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix link errors with gcc-4.3
sparc64: replace remaining __FUNCTION__ occurances
sparc: replace remaining __FUNCTION__ occurances
[SPARC]: Add reboot_command[] extern decl to asm/system.h
[SPARC]: Mark linux_sparc_{fpu,chips} static.

show more ...


# c8edc89d 29-Feb-2008 David S. Miller <davem@davemloft.net>

[SPARC]: Mark linux_sparc_{fpu,chips} static.

Caught by sparse.

Signed-off-by: David S. Miller <davem@davemloft.net>


Revision tags: v2.6.25-rc3, v2.6.25-rc2, v2.6.25-rc1, v2.6.24, v2.6.24-rc8, v2.6.24-rc7, v2.6.24-rc6, v2.6.24-rc5, v2.6.24-rc4, v2.6.24-rc3, v2.6.24-rc2, v2.6.24-rc1, v2.6.23, v2.6.23-rc9, v2.6.23-rc8, v2.6.23-rc7, v2.6.23-rc6, v2.6.23-rc5, v2.6.23-rc4, v2.6.23-rc3, v2.6.23-rc2, v2.6.23-rc1, v2.6.22, v2.6.22-rc7, v2.6.22-rc6, v2.6.22-rc5, v2.6.22-rc4, v2.6.22-rc3, v2.6.22-rc2, v2.6.22-rc1, v2.6.21, v2.6.21-rc7, v2.6.21-rc6, v2.6.21-rc5, v2.6.21-rc4, v2.6.21-rc3, v2.6.21-rc2, v2.6.21-rc1, v2.6.20, v2.6.20-rc7, v2.6.20-rc6, v2.6.20-rc5, v2.6.20-rc4, v2.6.20-rc3, v2.6.20-rc2, v2.6.20-rc1, v2.6.19, v2.6.19-rc6, v2.6.19-rc5, v2.6.19-rc4, v2.6.19-rc3, v2.6.19-rc2, v2.6.19-rc1, v2.6.18, v2.6.18-rc7, v2.6.18-rc6, v2.6.18-rc5, v2.6.18-rc4, v2.6.18-rc3, v2.6.18-rc2, v2.6.18-rc1
# 05668381 03-Jul-2006 Sam Ravnborg <sam@mars.ravnborg.org>

Merge branch 'master' of /home/sam/kernel/linux-2.6/


# 026477c1 03-Jul-2006 Trond Myklebust <Trond.Myklebust@netapp.com>

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/


# 0a1340c1 03-Jul-2006 Steven Whitehouse <swhiteho@redhat.com>

Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

include/linux/kernel.h


# 22a3e233 01-Jul-2006 Linus Torvalds <torvalds@g5.osdl.org>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_en

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_encrypt
arch/arm26/Kconfig typos
Documentation/IPMI typos
Kconfig: Typos in net/sched/Kconfig
v9fs: do not include linux/version.h
Documentation/DocBook/mtdnand.tmpl: typo fixes
typo fixes: specfic -> specific
typo fixes in Documentation/networking/pktgen.txt
typo fixes: occuring -> occurring
typo fixes: infomation -> information
typo fixes: disadvantadge -> disadvantage
typo fixes: aquire -> acquire
typo fixes: mecanism -> mechanism
typo fixes: bandwith -> bandwidth
fix a typo in the RTC_CLASS help text
smb is no longer maintained

Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S

show more ...


1...<<11121314151617181920