aboutsummaryrefslogtreecommitdiffstats
path: root/net/lapb/lapb_in.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-14 21:37:04 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-14 21:37:04 +0200
commit853b20396becfe9425f4d5da74e10ea67811b188 (patch)
tree6cbd5db9ce11677769a34d205a47907a0f2a75a8 /net/lapb/lapb_in.c
parentMerge tag 'omap-devel-hwmod-data-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm (diff)
parentDocumentation: update docs for mmp dt (diff)
downloadlinux-dev-853b20396becfe9425f4d5da74e10ea67811b188.tar.xz
linux-dev-853b20396becfe9425f4d5da74e10ea67811b188.zip
Merge branch 'mmp/dt' into next/pm
The mmp power management changes are based on this branch, so pull it in as a dependency. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions