aboutsummaryrefslogtreecommitdiff
path: root/net/lapb/lapb_timer.c
diff options
context:
space:
mode:
authorArnd Bergmann <[email protected]>2012-07-02 23:03:51 +0200
committerArnd Bergmann <[email protected]>2012-07-02 23:05:04 +0200
commitc911a3169ed81bbda023740b76457aa795a4f910 (patch)
tree8e05e98068f0380376735a8575af9bb42ab27502 /net/lapb/lapb_timer.c
parentca24a145573124732152daff105ba68cc9a2b545 (diff)
parent5130216265f6f924a4ba8214787241be96d93467 (diff)
Merge branch 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/pinctrl
* 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel: PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Linus Walleij <[email protected]>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions