Merge 3.14-rc5 into char-misc-next

We want these fixes in here as well.
Šī revīzija ir iekļauta:
Greg Kroah-Hartman
2014-03-02 19:53:09 -08:00
revīzija aa074c1c80
169 mainīti faili ar 1891 papildinājumiem un 1153 dzēšanām

Parādīt failu

@@ -27,7 +27,7 @@ FMC_PARAM_BUSID(fwe_drv);
/* The "file=" is like the generic "gateware=" used elsewhere */
static char *fwe_file[FMC_MAX_CARDS];
static int fwe_file_n;
module_param_array_named(file, fwe_file, charp, &fwe_file_n, 444);
module_param_array_named(file, fwe_file, charp, &fwe_file_n, 0444);
static int fwe_run_tlv(struct fmc_device *fmc, const struct firmware *fw,
int write)