tree b1797d88eb6ea57e618a68a23b960e4176449926
parent 03746bad30890284cc14fc39184c5b60b9cb8bc9
parent 1966287dfa07b2aa125009587a5d2b8375775c53
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1185317863 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1185317863 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/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.