tree 363be899124b4f8af5a54d7862be1b56be5f9adf
parent c1bad36054828b6a625afea39deb83d0e66e4336
parent 84c4f2f21a8e6e6d4bdfff95bf5ddc7925df4e01
author Linus Torvalds <torvalds@linux-foundation.org> 1220914518 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1220914518 -0700

Merge branch 'master' of git://git.kernel.org/pub/scm/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