Merge branch 'upstream-head' into tuxonice-head
configs-3.9: update dell-vostro-3360.config
configs-3.9: move asus-g73sw.config to deprecated
Merge branch 'upstream-head' into tuxonice-head
Add missing symbol exports for TuxOnIce module build.

Signed-off-by: Nigel Cunningham <nigel@nigelcunningham.com.au>
Merge branch 'upstream-head' into tuxonice-head
Merge branch 'upstream-head' into tuxonice-head

Conflicts:
	include/linux/blk_types.h
Switch BIO TOI flag from bi_rw to bi_flags.

All bi_rw flags are now used in vanilla (32 bits) so switch to using
bi_flags.

Signed-off-by: Nigel Cunningham <nigel@nigelcunningham.com.au>
Merge branch 'upstream-head' into tuxonice-head
Fix xfs_trans_ail freezing.

There's a code path in xfsaild that wasn't properly considered in
making xfsaild freezable. Address that so that the thread can be
properly frozen.

Signed-off-by: Nigel Cunningham <nigel@nigelcunningham.com.au>
Merge branch 'upstream-head' into tuxonice-head
Merge branch 'upstream-head' into tuxonice-head
Merge branch 'upstream-head' into tuxonice-head
configs-3.9: update dell-vostro-3360.config
Merge branch 'upstream-head' into tuxonice-head
Merge branch 'upstream-head' into tuxonice-head
Merge branch 'upstream-head' into tuxonice-head
Merge branch 'upstream-head' into tuxonice-head
Merge branch 'upstream-head' into tuxonice-head
Merge branch 'upstream-head' into tuxonice-head