diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-08 19:51:01 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 19:51:19 +0100 |
| commit | fd41d91df99be02f4fc3fe79d707d2786d6e40eb (patch) | |
| tree | 10fdd9626f5085e9b2c22204aea949a6bc0d8bba /arch/x86/include/asm/agp.h | |
| parent | Merge tag 'swarren-for-3.9-arm-timer-rework' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | ARM: sunxi: fix struct sys_timer removal (diff) | |
| download | linux-fd41d91df99be02f4fc3fe79d707d2786d6e40eb.tar.xz linux-fd41d91df99be02f4fc3fe79d707d2786d6e40eb.zip | |
Merge branch 'timer/cleanup' into next/cleanup
Adding a manually applied bugfix for sunxi.
* timer/cleanup:
ARM: sunxi: fix struct sys_timer removal
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/x86/include/asm/agp.h')
0 files changed, 0 insertions, 0 deletions