aboutsummaryrefslogtreecommitdiffstats
path: root/net/lapb/lapb_in.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-05-09 09:58:42 -0700
committerTony Lindgren <tony@atomide.com>2012-05-09 09:58:42 -0700
commitbfd17879866b36e95c58721da070d9f2ac7f8901 (patch)
tree2381206a25ba7d664f4b787321ca5ce253e6a22c /net/lapb/lapb_in.c
parentMerge tag 'omap-devel-b-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-prcm (diff)
parentARM: OMAP2+: WDTIMER integration: fix !PM boot crash, disarm timer after hwmod reset (diff)
downloadlinux-dev-bfd17879866b36e95c58721da070d9f2ac7f8901.tar.xz
linux-dev-bfd17879866b36e95c58721da070d9f2ac7f8901.zip
Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod-data
Some OMAP IP block data additions for 3.5, along with a fix for a longstanding watchdog timer integration problem.
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions