Last commit made on 2007-10-03
Get this branch:
git clone -b reverted-unionfs https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/gutsy
Members of Ubuntu Kernel Repositories can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

1b939ef... by Kyle McMartin <email address hidden> on 2007-10-03

Merge branch 'master' of git://kernel.ubuntu.com/ubuntu/ubuntu-gutsy

1ca7d99... by Tim Gardner on 2007-10-03

Merge branch 'master' of zinc.ubuntu.com:ubuntu-gutsy

6c7bbe8... by Tim Gardner on 2007-10-03

UBUNTU: ide-disk: workaround for buggy HPA support on ST340823A (take 4)
Bug: 26119

This commit fixes comple problems introduced with bd393e276a79f25e92296f26d3da3fe1b9b51fec. It
was a cherry-pick from 2.6.23-rc*. In that context the patch makes sense. However, 2.6.22 has
a somewhat different organization. The simplest solution is some ifdef hacks. Definitely rip
this out before rebasing for Hardy.

Signed-off-by: Tim Gardner <email address hidden>

c05bc32... by Kyle McMartin <email address hidden> on 2007-10-03

Revert "UBUNTU: apparmor 10.3 hooks"

This reverts commit 65d40483a4bf80ee16c93961a3c26c86c5186a80.

0f086f6... by Kyle McMartin <email address hidden> on 2007-10-03

Revert "UBUNTU: unionfs 2.1 hooks"

This reverts commit 8b179ba540c15bfe5ef2ac1504cf7481c323d384.

b040128... by Kyle McMartin <email address hidden> on 2007-10-03

Revert "UBUNTU: nuke UNION_FS stuff from fs/{Kconfig,Makefile}"

This reverts commit ddc578526195295a49e6d6bcbbf0049ed3125ade.

57b159f... by Dave Airlie <email address hidden> on 2007-09-28

i915: make vbl interrupts work properly on i965g/gm hw.

This code is ported from the DRM git tree and allows the vblank interrupts
to function on the i965 hw. It also requires a change in Mesa's 965 driver
to actually use them.

[ Without this patch, my 965GM drops vblank interrupts - Jesse ]

Signed-off-by: Dave Airlie <email address hidden>
Acked-by: Jesse Barnes <email address hidden>
Signed-off-by: Linus Torvalds <email address hidden>
(cherry picked from commit e4a7b1d1d90d202a030688ab5b177c3c0f15ee3e)

3633914... by Amit Kucheria on 2007-10-03

UBUNTU: Update configuration files

Update lpiacompat flavour config

Signed-off-by: Amit Kucheria <email address hidden>

43e3d16... by Ben Collins on 2007-10-03

Merge branch 'origin'

c0396d7... by Ben Collins on 2007-10-03

UBUNTU: ubuntu: Set NR_CPUS=256 for sparc64-smp

Signed-off-by: Ben Collins <email address hidden>