diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 22:41:50 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 22:41:50 +0200 |
| commit | 36c678f3c91ac92e9524abcf9b39f9f539d60279 (patch) | |
| tree | c9c0df006a7e9bcc14492b1d1fa6aa2c5c43d3a3 /drivers/input/tablet/acecad.c | |
| parent | 4450cb7d586c3d8f6615ee437eab1d1e064b20c0 (diff) | |
| parent | 14ac5b884eff23f53139dd4508f428aee906d8c2 (diff) | |
Merge tag 'imx-clk' of git://git.pengutronix.de/git/imx/linux-2.6 into next/clk
From Sascha Hauer <s.hauer@pengutronix.de>:
i.MX clk noncritical fixes and updates
* tag 'imx-clk' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx: clk-imx31: Fix clock id for rnga driver
ARM: imx: add missing item to the list of clock event modes
ARM: i.MX5x CSPI: Fixed clock name for CSPI
ARM: i.MX5x clocks: Fix GPT clocks
ARM: i.MX5x clocks: Fix parent for PWM clocks
ARM: i.MX5x clocks: Add EPIT support
ARM: mx27: Reenable silicon version print
ARM: clk-imx27: Fix rtc clock id
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/input/tablet/acecad.c')
0 files changed, 0 insertions, 0 deletions