summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/icmp_socket.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-23 23:15:43 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-23 23:15:43 +0100
commit4383822020c54c21eb2eb939a3233b44a51e8ca0 (patch)
tree3bfc91336f7310e3b70058db85e28833067bc661 /net/batman-adv/icmp_socket.c
parentbf900afba96bf34038bf2c944bbcad7424a40051 (diff)
parentb5d667eb392ed901fc7ae76869c7a130559e193c (diff)
downloadblackbird-obmc-linux-4383822020c54c21eb2eb939a3233b44a51e8ca0.tar.gz
blackbird-obmc-linux-4383822020c54c21eb2eb939a3233b44a51e8ca0.zip
Merge branch 'acpi-pm' into fixes
* acpi-pm: ACPI / PM: Take unusual configurations of power resources into account
Diffstat (limited to 'net/batman-adv/icmp_socket.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud