aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/omap_device.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-05-02 21:30:36 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-05-02 21:30:36 +0100
commit946342d03ec4e8367bba7bb99e7155e97f69058a (patch)
treebf61b17951f3696c3cde69624fcccdc05370e8aa /arch/arm/mach-omap2/omap_device.c
parent70100a02268423b7bceafdf0ed6b0245f9baf7e8 (diff)
parentf8f02ec25ce3eafb049feeb3abf34fcd6e338241 (diff)
parent1783d4574619aea9ff5d94e6506f288547fc6737 (diff)
parent848a7b13aef0d8d611b6461b6cc250319fc1dbe1 (diff)
parent6aaa189f8712471a250bfdf8fc8d08277258b8ab (diff)
parent5e45a0a1975df83fc068349e6a31fdf6af61a458 (diff)
Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'smp-hotplug' into for-linus