merge conflicts
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Apr 2005 11:51:02 +0000 (11:51 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Apr 2005 11:51:02 +0000 (11:51 +0000)
commit0c7bd9ba4da5dbf31c5b2b704c135dcb385a6bd3
tree1cf56a3614903a01adc3764e1f28cd53a63b136d
parent4de5c6026e00ad4dfd9fbb072b47bec4e2d97b55
merge conflicts

2005/04/19 13:43:30+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/04/19 13:43:18+02:00 uni-frankfurt.de!mickeyl
oz-kernel-c7x0: enable bluetooth rfcomm and hciuart stuff. apply the inotify patch from rml and enable it in defconfig for all models

BKrev: 4264f0a682WVoxBABEKZ5VzGxjA7Ag
packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0
packages/linux/linux-openzaurus-2.6.11/defconfig-collie
packages/linux/linux-openzaurus-2.6.11/defconfig-poodle
packages/linux/linux-openzaurus-2.6.11/defconfig-tosa
packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb