From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 24 Jul 2007 22:57:43 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: MMI-PSA29.97-13-9~41168
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9e72ea82e62dd714bc11ed29bfe09a7fc8ac24fe;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok
  [SPARC32]: Fix bug in sparc optimized memset.
  [SPARC64]: Update defconfig.
  [SPARC]: Add missing NOTES section.
  [SPARC32]: missing exports
  [SPARC32]: Deal with rtc/sun_mostek_rtc conflict.
---

9e72ea82e62dd714bc11ed29bfe09a7fc8ac24fe