Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 26 Jun 2007 23:49:57 +0000 (16:49 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 26 Jun 2007 23:49:57 +0000 (16:49 -0700)
commit2c9dbda360d96819456f845ea92e20e4e9d0ed36
treeeca42c0d0ad7b4092b6b90eef3c50ef52a209970
parent9a08e732533b940d2d31f4e9999dfee5e1ca3914
parentae62fbb5f1f796d87cbdbe6701e13f2b52d5c0a7
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix subtle FP state corruption bug in signal return on SMP
  [POWERPC] Fix VDSO gettimeofday() when called with NULL struct timeval
  [POWERPC] Update defconfigs
  [POWERPC] Update g5_defconfig