Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6de7dc2c authored by Dave Kleikamp's avatar Dave Kleikamp
Browse files

Merge with /home/shaggy/git/linus-clean/ 



Signed-off-by: default avatarDave Kleikamp <shaggy@austin.ibm.com>
parents cbc3d65e 9e566d8b

Documentation/scsi/scsi_mid_low_api.txt

+0 −15
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ Summary: 
   scsi_remove_device - detach and remove a SCSI device

   scsi_remove_host - detach and remove all SCSI devices owned by host

   scsi_report_bus_reset - report scsi _bus_ reset observed

   scsi_set_device - place device reference in host structure

   scsi_track_queue_full - track successive QUEUE_FULL events 

   scsi_unblock_requests - allow further commands to be queued to given host

   scsi_unregister - [calls scsi_host_put()]
@@ -740,20 +739,6 @@ int scsi_remove_host(struct Scsi_Host *shost) 
void scsi_report_bus_reset(struct Scsi_Host * shost, int channel)





/**

 * scsi_set_device - place device reference in host structure

 * @shost: a pointer to a scsi host instance

 * @pdev: pointer to device instance to assign

 *

 *      Returns nothing

 *

 *      Might block: no

 *

 *      Defined in: include/scsi/scsi_host.h .

 **/

void scsi_set_device(struct Scsi_Host * shost, struct device * dev)





/**

 * scsi_track_queue_full - track successive QUEUE_FULL events on given

 *                      device to determine if and when there is a need

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -1416,13 +1416,20 @@ W: http://www.penguinppc.org/ 
L:	linuxppc-embedded@ozlabs.org

S:	Maintained



LINUX FOR POWERPC EMBEDDED PPC8XX AND BOOT CODE

LINUX FOR POWERPC BOOT CODE

P:	Tom Rini

M:	trini@kernel.crashing.org

W:	http://www.penguinppc.org/

L:	linuxppc-embedded@ozlabs.org

S:	Maintained



LINUX FOR POWERPC EMBEDDED PPC8XX

P:	Marcelo Tosatti

M:	marcelo.tosatti@cyclades.com

W:	http://www.penguinppc.org/

L:	linuxppc-embedded@ozlabs.org

S:	Maintained



LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX

P:     Kumar Gala

M:     kumar.gala@freescale.com

arch/alpha/kernel/process.c

+0 −3
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ machine_restart(char *restart_cmd) 
	common_shutdown(LINUX_REBOOT_CMD_RESTART, restart_cmd);

}



EXPORT_SYMBOL(machine_restart);



void

machine_halt(void)
@@ -173,7 +172,6 @@ machine_halt(void) 
	common_shutdown(LINUX_REBOOT_CMD_HALT, NULL);

}



EXPORT_SYMBOL(machine_halt);



void

machine_power_off(void)
@@ -181,7 +179,6 @@ machine_power_off(void) 
	common_shutdown(LINUX_REBOOT_CMD_POWER_OFF, NULL);

}



EXPORT_SYMBOL(machine_power_off);



/* Used by sysrq-p, among others.  I don't believe r9-r15 are ever

   saved in the context it's used.  */

arch/arm/kernel/process.c

+0 −4
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ void machine_halt(void) 
{

}



EXPORT_SYMBOL(machine_halt);



void machine_power_off(void)

{
@@ -139,7 +138,6 @@ void machine_power_off(void) 
		pm_power_off();

}



EXPORT_SYMBOL(machine_power_off);



void machine_restart(char * __unused)

{
@@ -169,8 +167,6 @@ void machine_restart(char * __unused) 
	while (1);

}



EXPORT_SYMBOL(machine_restart);



void __show_regs(struct pt_regs *regs)

{

	unsigned long flags = condition_codes(regs);

arch/arm/mach-s3c2410/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o 
# S3C2440 support



obj-$(CONFIG_CPU_S3C2440)  += s3c2440.o s3c2440-dsc.o

obj-$(CONFIG_CPU_S3C2440)  += s3c2440-irq.o

obj-$(CONFIG_CPU_S3C2440)  += s3c2440-clock.o



# machine specific support