summaryrefslogtreecommitdiffstats
path: root/drivers/char/scc.h
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2008-08-06 13:58:26 +0200
committerWim Van Sebroeck <wim@iguana.be>2008-08-06 13:58:26 +0200
commit96e2e6fafaedd83bd899f682907e14d1eec17390 (patch)
tree62371e739210426c1a6341b0afc5b2d933ef23ce /drivers/char/scc.h
parentLinux 2.6.27-rc2 (diff)
parent[WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl (diff)
downloadlinux-96e2e6fafaedd83bd899f682907e14d1eec17390.tar.xz
linux-96e2e6fafaedd83bd899f682907e14d1eec17390.zip
[WATCHDOG] Merge code clean-up's from Alan Cox.
Merge branch 'alan' of ../linux-2.6-watchdog-mm Fixed Conflicts in the following files: drivers/watchdog/booke_wdt.c drivers/watchdog/mpc5200_wdt.c drivers/watchdog/sc1200wdt.c Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char/scc.h')
0 files changed, 0 insertions, 0 deletions