summaryrefslogtreecommitdiffstats
path: root/net/atm/pppoatm.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-15 10:18:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-15 10:18:36 -0700
commit5a2b3ef4559f3d0ef58cbfb723f528f1c6b2e601 (patch)
tree3421b2051cec89dcdf98b71f100837698f149ade /net/atm/pppoatm.c
parentc9192798b9318a4b3f96c41ae27805cc8b46b7ee (diff)
parent1c8cf9c997a4a6b36e907c7ede5f048aeaab1644 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: mmc: sdio: fix SDIO suspend/resume regression
Diffstat (limited to 'net/atm/pppoatm.c')
0 files changed, 0 insertions, 0 deletions