From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Tue, 12 Dec 2006 02:28:59 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
X-Git-Tag: v2.6.20-rc1~146^2~13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd39301a68f9604854f3543117b01dc73cbe193f;p=linux-2.6

Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32

* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
  [AVR32] Add missing #include <linux/param.h> to delay.c
  [AVR32] Pass dev parameter to dma_cache_sync()
  [AVR32] Implement intc_get_pending()
  [AVR32] Don't include <asm/delay.h>
  [AVR32] Put the chip in "stop" mode when halting the system
  [AVR32] Set flow handler for external interrupts
  [AVR32] Remove unused file
  [AVR32] Remove mii_phy_addr and eth_addr from eth_platform_data
  [AVR32] Move ethernet tag parsing to board-specific code
  [AVR32] Add macb1 platform_device
  [AVR32] Portmux API update
---

cd39301a68f9604854f3543117b01dc73cbe193f