diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-04 18:45:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-07 21:08:26 -0800 |
| commit | daaeec936fe43f7f3f15e61e1da86f1fa1c37e3e (patch) | |
| tree | 2290013d78edd149839a462903c7aa02598a8cb1 /net/sched/sch_htb.c | |
| parent | 1ddda1cd235e05961bada337f87494272701c189 (diff) | |
| parent | d9621176872319a568d9892701410bcbfbd5b35c (diff) | |
Merge tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into fixes
From Linus Walleij:
Two fixes to the Nomadik:
- Delete a dangling include
- Bump IRQ numbers to offset at 32
* tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: nomadik: bump the IRQ numbers again
ARM: nomadik: delete dangling include
Diffstat (limited to 'net/sched/sch_htb.c')
0 files changed, 0 insertions, 0 deletions