Re: [PATCH] fastboot: fix mismerged conflict in init/main.c

[Arjan van de Ven]

On Fri, 19 Sep 2008 19:42:15 -0700
Arjan van de Ven <arjan@xxxxxxxxxxxxx> wrote:

> 
> 
> From: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
> Subject: [PATCH] fastboot: fix mismerged conflict in init/main.c

ok turns out it was a real conflict, not a mismerge. I've just fixed it
and pushed out my git tree.

The following changes since commit
77e9695b9d5c9ce761dedc193045d9cb64b8e245: Arjan van de Ven (1):
        Add a script to visualize the kernel boot process / time

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-fastboot.git
master

Arjan van de Ven (2):
      fastboot: fix issues and improve output of bootgraph.pl
      use the fancy new printk flags to print the function pointer

Arnaud Patard (1):
      fastboot: Fix bootgraph.pl initcall name regexp

 init/main.c          |    8 +++-----
 scripts/bootgraph.pl |   33 +++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 17 deletions(-)

-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/