Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

This commit is contained in:
David Woodhouse 2008-07-25 10:40:14 -04:00
commit ff877ea80e
6656 changed files with 513186 additions and 432171 deletions

View file

@ -188,7 +188,7 @@ typedef union {
*/
struct map_info {
char *name;
const char *name;
unsigned long size;
resource_size_t phys;
#define NO_XIP (-1UL)