From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Mon, 14 Dec 2009 18:23:03 +0000 (+0100)
Subject: Merge commit 'v2.6.32'
X-Git-Tag: v2.6.33-rc1~79^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=559300bc0ef7ccd541656f1189d38e7088389559;p=users%2Fdwmw2%2Flinux.git

Merge commit 'v2.6.32'

Conflicts:
	arch/avr32/mach-at32ap/include/mach/cpu.h
---

559300bc0ef7ccd541656f1189d38e7088389559