summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-03-03 10:25:18 -0800
committerTony Lindgren <tony@atomide.com>2011-03-03 10:25:18 -0800
commit077f8ec889bb1eb26a7128fdbc75922755ed2320 (patch)
tree196fe4b28dbda6f1036902c50a109fecb990cd76 /net
parent525a11381bcad9a7f55d0bac9c8676fe71819002 (diff)
parentb3329a33b5a3902e65c5517f41c374f5adb060e1 (diff)
downloadtalos-op-linux-077f8ec889bb1eb26a7128fdbc75922755ed2320.tar.gz
talos-op-linux-077f8ec889bb1eb26a7128fdbc75922755ed2320.zip
Merge branch 'for_2.6.38/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-fixes
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud