commit 2a86cb7c2b1e9eb98b36d0a3cf4444d8851968b1
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 13 12:06:58 2011 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 13 12:06:58 2011 -0800
tree 9555558356509c8b938a768457f70dafe3bfa3b7
parent 8a0eebf66e3b1deae036553ba641a9c2bdbae678
parent c975ffadd144e8e99e83e8f80ee94efce4f170b5

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
  avr32: update default configuration files for Atmel boards
  avr32: Convert to clocksource_register_hz
  avr32: make architecture sys_clone prototype match asm-generic prototype
  avr32: use syscall prototypes from asm-generic instead of arch
  avr32: disable kprobes for all default configurations
  avr32: boards: setup: use IS_ERR() instead of NULL check