From: Olof Johansson <olof@lixom.net>
Date: Fri, 27 Jan 2012 07:06:52 +0000 (-0800)
Subject: Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
X-Git-Tag: v3.3-rc2~19^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d1a8c54b704a4bcf62c0c109ec764277f0bcc57d;p=linux.git

Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

* 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: Fix at91sam9g45 and at91cap9 reset
  ARM: at91: make rstc soc independent
  ARM: at91: introduce AT91_SAM9_ALT_RESET to select the at91sam9 alternative reset
  ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h
  ARM: at91: fix cap9 ddrsdr register
  ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low
  USB: at91: fix clk_get error handling
  ARM: at91: removal of CAP9 SoC family
  ARM: at91: fix at91rm9200 soc subtype handling
---

d1a8c54b704a4bcf62c0c109ec764277f0bcc57d