linux-next: manual merge of the l2-mtd tree with Linus' tree

From: Stephen Rothwell
Date: Sun Dec 18 2011 - 21:57:29 EST

Next message: Daisuke Nishimura: "Re: [PATCH -tip 0/3] sched: some fixes for vruntime calculationrelated to cgroup movement(v2)"
Previous message: Anton Vorontsov: "Android low memory killer vs. memory pressure notifications"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Artem,

Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/maps/bcm963xx-flash.c between commit 4e549d6d4a32 ("MTD:
MAPS: bcm963xx-flash.c: explicitly include module.h") from Linus' tree
and commit 573052d2e4a4 ("mtd: maps: remove the now unused
bcm963xx-flash") from the l2-mtd tree.

The latter removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Daisuke Nishimura: "Re: [PATCH -tip 0/3] sched: some fixes for vruntime calculationrelated to cgroup movement(v2)"
Previous message: Anton Vorontsov: "Android low memory killer vs. memory pressure notifications"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]