diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 14:25:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 14:25:48 -0700 |
commit | 698f7a4a12c15fef354b2a1ac14f90a0e71008d9 (patch) | |
tree | e8332a80e1ca588a374647111c20b4aa2ee36aac /include/linux/rxrpc.h | |
parent | adbd5886da5f467148b26cca3728ab0e672b3fcc (diff) | |
parent | ba75321193900a236bc5bbc29145e1039f74eb1b (diff) |
Merge git://git.infradead.org/~dwmw2/mtd-2.6.26
* git://git.infradead.org/~dwmw2/mtd-2.6.26:
[MTD] [MAPS] Fix cmdlineparse handling in mapping files
[MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path
Diffstat (limited to 'include/linux/rxrpc.h')
0 files changed, 0 insertions, 0 deletions