Merge branch 'linux-2.6' into next
authorPaul Mackerras <paulus@samba.org>
Tue, 11 Nov 2008 21:43:22 +0000 (08:43 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 11 Nov 2008 21:43:22 +0000 (08:43 +1100)
commit486936cd93e99c802153b3f2f629c5ce62b8c0d4
tree51e261a96e1fb6b51d4a6afb92bfc2480e150b6c
parent1c1b777a5673b57a6c0377ba60a790d05e4a0676
parentf21f237cf55494c3a4209de323281a3b0528da10
Merge branch 'linux-2.6' into next