diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 13:18:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 13:18:52 -0700 |
| commit | 472e374161bc00d392e1755fe9915f42b11e310f (patch) | |
| tree | 0c72daa900a20c895036832d521019ae26ca3931 /net/lapb/lapb_timer.c | |
| parent | 463b21fb27509061b3e97fb4fa69f26d089ddaf4 (diff) | |
| parent | 4dc5aa2172373fe7ccc25bc22fc21fcf150a66c5 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68k fixes from Greg Ungerer:
"Just a couple of fixes. Clean up compile warnings by using correct
types in function args, and clean out the removed CONFIG_MTD_PARTITIONS"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: fix arg types for outs* functions
m68k : Kill CONFIG_MTD_PARTITIONS
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions