Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2008 22:55:18 +0000 (15:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2008 22:55:18 +0000 (15:55 -0700)
commit82a28c794f27aac17d7a3ebd7f14d731a11a5532
tree363be899124b4f8af5a54d7862be1b56be5f9adf
parentc1bad36054828b6a625afea39deb83d0e66e4336
parent84c4f2f21a8e6e6d4bdfff95bf5ddc7925df4e01
Merge branch 'master' of git://git./linux/kernel/git/hskinnemoen/avr32-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  avr32: pm_standby low-power ram bug fix
  avr32: Fix lockup after Java stack underflow in user mode