From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Jan 2011 20:06:58 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2a86cb7c2b1e9eb98b36d0a3cf4444d8851968b1;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./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
---

2a86cb7c2b1e9eb98b36d0a3cf4444d8851968b1