diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-02 20:00:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-02 20:00:54 -0700 |
| commit | b55a0ff8df92646696c858a8fea4dbf38509f202 (patch) | |
| tree | 9b3fb1da94093e5147b1ef5bcd5277f9187c32cd /drivers/misc/mei/main.c | |
| parent | a727eaf64ff084a50b983fc506810c7a576b7ce3 (diff) | |
| parent | 83c6bdb827c9422fe6e02130d9546800143304c1 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu into next
Pull m68knommu updates from Greg Ungerer:
"Nothing too big, just a handfull of small changes.
A couple of dragonball fixes, coldfire qspi cleanup and fixes, and
some coldfire gpio cleanup, fixes and extensions"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: Implement gpio support for m54xx.
m68knommu: Make everything thats not exported, static.
m68knommu: setting the gpio data direction register to output doesn't dependent upon the value to output!
m68knommu: add to_irq function so we can map gpios to external interrupts.
m68knommu: qspi declutter.
m68knommu: Fix the 5249/525x qspi base address.
m68knommu: Add qspi clk for Coldfire SoCs without real clks.
m68k: fix a compiler warning when building for DragonBall
m68knommu: Fix mach_sched_init for EZ and VZ DragonBall chips
Diffstat (limited to 'drivers/misc/mei/main.c')
0 files changed, 0 insertions, 0 deletions