Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide-tape: Don't leak kernel stack information
ide: fix memory leak when flush command is issued

+2
+1
drivers/ide/ide-disk.c
··· 455 455 456 456 rq->cmd_type = REQ_TYPE_ATA_TASKFILE; 457 457 rq->special = cmd; 458 + cmd->rq = rq; 458 459 } 459 460 460 461 ide_devset_get(multcount, mult_count);
+1
drivers/ide/ide-tape.c
··· 1064 1064 tape->best_dsc_rw_freq = config.dsc_rw_frequency; 1065 1065 break; 1066 1066 case 0x0350: 1067 + memset(&config, 0, sizeof(config)); 1067 1068 config.dsc_rw_frequency = (int) tape->best_dsc_rw_freq; 1068 1069 config.nr_stages = 1; 1069 1070 if (copy_to_user(argp, &config, sizeof(config)))