David S. Miller e9011d0866 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc ...

Conflicts:
	arch/sparc/mm/init_64.c

Conflict was simple non-overlapping additions.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-08-05 18:57:18 -07:00

..

bbc_envctrl.c

bbc-i2c: Fix BBC I2C envctrl on SunBlade 2000

2014-08-04 16:53:43 -07:00

bbc_i2c.c

bbc-i2c: Fix BBC I2C envctrl on SunBlade 2000

2014-08-04 16:53:43 -07:00

bbc_i2c.h

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

display7seg.c

drivers/sbus/char: Micro-optimization in display7seg.c

2014-07-21 21:37:05 -07:00

envctrl.c

sparc: delete non-required instances of include <linux/init.h>

2014-01-28 23:38:23 -08:00

flash.c

sparc: delete non-required instances of include <linux/init.h>

2014-01-28 23:38:23 -08:00

jsflash.c

jsflash: missed conversion from rq->buffer to bio_data(rq->bio)

2014-04-16 14:15:25 -06:00

Kconfig

drivers/sbus/char: remove depends on CONFIG_EXPERIMENTAL

2013-01-11 11:39:03 -08:00

Makefile

sparc: Kill sbus mostek RTC driver.

2008-09-03 15:55:32 -07:00

max1617.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

openprom.c

drivers/sbus/char: removes unnecessary semicolon

2012-09-21 12:08:56 -07:00

uctrl.c

sparc: delete non-required instances of include <linux/init.h>

2014-01-28 23:38:23 -08:00