The following commit has been merged in the linux branch: commit 601adfedba37326410760d8d60f5da99a0adfd2f Merge: 655bdb0e07384d04d1ecfd709c7aee6cc8bd8793 e9a63a4e559fbdc522072281d05e6b13c1022f4b Author: Linus Torvalds torvalds@linux-foundation.org Date: Wed Oct 14 15:33:05 2009 -0700

Merge branch 'topic/x86-lds-nits' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland

* 'topic/x86-lds-nits' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland: x86: linker script syntax nits