diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-15 20:25:41 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-15 20:25:41 +0100 |
commit | a520458fccc5f5dd4d0ed63c0602db2fd3172b21 (patch) | |
tree | 3bca2be919eac0bfb50bd0623cda6df589260de8 /drivers/mmc/host/sdhci.h | |
parent | Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security (diff) | |
parent | UBI: use own macros for the layout volume (diff) | |
download | linux-a520458fccc5f5dd4d0ed63c0602db2fd3172b21.tar.xz linux-a520458fccc5f5dd4d0ed63c0602db2fd3172b21.zip |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBI: use own macros for the layout volume
UBI: fix nameless volumes handling
UBIFS: fix non-debug configuration build
Diffstat (limited to 'drivers/mmc/host/sdhci.h')
0 files changed, 0 insertions, 0 deletions