| commit | 1cce92aef225171705c3f53a871938abca2177de | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 19 16:03:38 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 19 16:03:38 2008 -0700 |
| tree | a6a4cc523c6918d616ec719b1a3eb8788d64dc3d | |
| parent | 79d57ab98b7bc32e5bb20683814cfb76dbb54a9e [diff] | |
| parent | 3d431a742728e6b619ce57a030a92d228c13d1d2 [diff] |
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: nmi_enter() without nmi_exit() avr32: fix sys_sync_file_range() call convention avr32: add generic_find_next_le_bit bit function avr32: add .gitignore files atstk1000: fix build breakage with BOARD_ATSTK100X_SW2_CUSTOM=y