Merge 3.7-rc6 into char-misc-next

This commit is contained in:
Greg Kroah-Hartman
2012-11-16 18:21:36 -08:00
545 changed files with 6377 additions and 3286 deletions

View File

@ -745,7 +745,7 @@ do_alignment_t32_to_handler(unsigned long *pinstr, struct pt_regs *regs,
static int
do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
{
union offset_union offset;
union offset_union uninitialized_var(offset);
unsigned long instr = 0, instrptr;
int (*handler)(unsigned long addr, unsigned long instr, struct pt_regs *regs);
unsigned int type;