Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 23 Oct 2006 14:51:20 +0000 (07:51 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 23 Oct 2006 14:51:20 +0000 (07:51 -0700)
commitd0b72a0817b0164986d35366c8ffe92fd985f713
tree0fde19a1454d8e91e7350dea9192f3a42244c3a4
parent2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29
parenta94b1d1fd7ca3129e1d38d38167779fa6ee69780
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: 8-byte align return value from compat_alloc_user_space()