Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

typedef unsigned int umode_t;

struct fnptr {

	unsigned long ip;

	unsigned long gp;

};

/*

 * These aren't exported outside the kernel to avoid name space clashes

 */

# ifdef __KERNEL__

struct fnptr {

	unsigned long ip;

	unsigned long gp;

};

/* DMA addresses are 64-bits wide, in general.  */

typedef u64 dma_addr_t;