diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-08-25 15:33:23 +0200 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-08-25 15:33:23 +0200 |
| commit | 39333610ba3b1e076ac1ceccca34de037a413a03 (patch) | |
| tree | a65c958206f5bcdebea561660c8d4733d5010309 /drivers/macintosh/windfarm_pid.h | |
| parent | Linux 3.17-rc1 (diff) | |
| parent | ARM: at91: remove old irq material (diff) | |
| parent | Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-39333610ba3b1e076ac1ceccca34de037a413a03.tar.xz linux-39333610ba3b1e076ac1ceccca34de037a413a03.zip | |
Merge branches 'at91-3.18-cleanup' and 'at91-3.18-dt' into at91-3.18-drivers