Merge branch 'linux-2.6' into next
authorPaul Mackerras <paulus@samba.org>
Thu, 18 Dec 2008 00:06:12 +0000 (11:06 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 18 Dec 2008 00:06:12 +0000 (11:06 +1100)
commitc280266a326ccabeb64b6d69fa4fd21faf5bf354
treef8a89e593a0ba43b75bb666d8e245b2460dc0d40
parenteddce368f99b682683e09cf206eaa25131d40abe
parent55dac3a5553b13891f0ae4bbd11920619b5436d4
Merge branch 'linux-2.6' into next