diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-18 15:27:41 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-18 15:27:41 (GMT) |
| commit | 35f8c769aa5f3d9a81d50e9bdcbfd4151e72a0c9 (patch) | |
| tree | 5541f88e5da4df063e53bcf841217d7c79d9aec4 /drivers/usb/gadget/f_obex.c | |
| parent | 4b767155ffad4be0aaafeead585ad21375dc7475 (diff) | |
| parent | 5bc7c33ca93a285dcfe7b7fd64970f6314440ad1 (diff) | |
| download | linux-fsl-qoriq-35f8c769aa5f3d9a81d50e9bdcbfd4151e72a0c9.tar.xz | |
Merge tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd
Pull MTD fixes from David Woodhouse:
"This fixes a couple of problems. Firstly, some people are actually
still using old small-page flash and we broke it by removing the ready
check.
Secondly. fix the handling of partitions on Broadcom 47xx devices.
Recent changes had made it misdetect the location of the NVRAM and
scribble over the bootloader when it tried to update the variables
there. With predictably sad results."
* tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd:
mtd: nand: reintroduce NAND_NO_READRDY as NAND_NEED_READRDY
mtd: bcm47xxpart: look for NVRAM at the end of device
Revert "mtd: bcm47xxpart: improve probing of nvram partition"
Diffstat (limited to 'drivers/usb/gadget/f_obex.c')
0 files changed, 0 insertions, 0 deletions